You think small. I’m hoping for an Article V deal where it can be re-written.
But I do think. And I think that one should not have to have been an employee of the Federal Government to vote, or to hold elected office like you have proposed. Fortunately, the Constitution of the United States, as it is now written, agrees with my line of thinking. Be careful what you wish for.