Change the limit to ONE term.
One term for all congressmen and presidents would work very well. This takes them out of constant campaign mode and to doing their job.
How about six months?
Two terms is perfect. A president will spend the first half of the first term learning the ropes, and the second half trying to get reelected. Then conceivably he can get some work done during the second term.
Okay, that didn’t apply to Bush, who rocked in the beginning but quickly petered-out after reelection, but you get the concept.