I agree. These individuals are turning being a Senator/Congressman into a lifelong career. Two terms max in the Senate, four in the House, and no more than 15 years total.
I agree with your idea, except that the limit can’t be an odd number of years, since the terms are six years for senators and two years for reps. The limit should be 16 years. It’s unfair that presidents have term limits and congressmen don’t.