Interesting idea and I do agree that contiguous is OK but total is not.

I think I'd suggest a more generous Senate term limit. Three terms (18 years) would allow for someone to see out a complete Presidential super-cycle, for example.

The word Senate is etymologically related to "senior", it's a place where you _want_ people to be able to develop a lot of institutional experience.