Simple, keep the GG. Just appoint him/her by 2/3 majority of a joint sitting of parliament. No other change required. No change to anyones power etc.
The fact that the constitution needs a complete rewrite and updating is a separate topic from the current discussion. As well as long over due. I will leave my thoughts for another thread.
dkit
