I think two terms is plenty.
God knows where we'd be now if Roosevelt had been healthy. Some people have suggested changing the presidency to one six-year term. There are pros and cons to that, but it looks better and better every election season.
Term limits on Senators wouldn't suck either.