I don't know what all has been said already in terms of a comprehensive amendment, but I would think something like this would be in order:
1. Attorney General powers taken over by Dean of the Senate, except for prosecution, which the Vice President would take over. If the VP is the one accused, the President appoints someone else to handle the prosecution.
2. VP also handles State, Defense, and Treasury departments.
3. SoFA remains as is.
4. VP is elected separately from Pres (make for a more interesting game I think). The VP is elected in the midterms.
Any Senator wishing to propose this as an amendment?
'Hawk'
Of course someone would have to rewrite it in bill form to propose it as an amendment.