Honestly, the constitution at this point is in fact irreparably fucked after the immunity ruling.
We need to throw it all out and start over with an actual democratic system with federal distribution of power that's an actual power sharing agreement instead of traitors jumping to whichever level of government they think they have the most control over at the moment.
Also, abolish the office of president. It's obvious that the independent executive will permanently stand as a danger to the republic no matter who ascends to the white house. The concept inherently promotes parasitic leaching of powers whenever an opposing branch doesn't do thing the executive wants.