Lighter, since I am not a US citizen, it does not matter whether I like your (future) constitution. General experience tells me that patching one "loophole" after the other is not likely to succeed, since each and every such hole has its stakeholders who defend it with claws and teeth. A complete restart may be easier - it will produce losers as well, but only in one go.

Political scientists are needed for technical advice. The rest must be done in public discussions.