Perhaps some kind of mixed term limit is possible. Two is just arbitrary, and for reasons Syntax Error and others pointed out, that creates tremendous volatility in the House. So perhaps maximum four consecutive terms or ten terms in total?
Two is fine for the Senate. Maybe three, I'm not wedded to a particular number.
I wholly agree that the problem with term limits is that it presents an arbitrary cutoff point where we might lose some people who otherwise are amazing public servants. Since we've had precisely zero of those in two centuries plus (hey, man, I love Bernie Sanders and really dug Dennis Kucinich, it's not like I would *insist* upon their right to exist in congress in perpetuity).
Oh, that reminds me - I would take congressional district boundary making out of the hands of federal and state congress altogether. I'm not 100% sold on who I *would* have evaluate it, but I'm just as

ing sick of gerrymandering as I am of the lack of term limits. Moreso, likely.