I would like to suggest that we just restrict anyone from serving more than 6 consecutive years in Congress and they must sit out one congress (2 years) before returning.
I know that one of the biggest complaints against term limits is the loss of experience and knowledge that is gained by time in the job, but if the Congressmen return after the next general election, then they are bringing back their experience and knowledge and it can grow if they can continue to beat all the young challengers that crop up during their hiatus.