I've been thinking about calling a Constitutional Convention to address this, and other problems.
Along with the Term Limits, I was going to propose this amendment: "No person may run for any political office if they currently hold a different office."
Basically, you can't have all these senators, representatives and governors currently running for president while still being paid our money.