And one third of the senate, IIRC. Expand the house term to three years, two term max. Reduce the senate term to five years, two terms max. After sixteen years in congress, if they want to run for governor, president or any other elective office, fine; same term limitations.
The states are another matter; they should enact term limits as well, but it would be like herding cats to get them all to agree to do so.
And, you should not run for office while holding another - governor, senator etc.
Nice fantasy, eh.