It was never the founding fathers intention for members of congress to have a career as being a member of congress. That being stated the Constitution should be amended to allow for only 2 - 6 year terms for senators and only 6 - 2 year terms for congressmen. The terms them selves could be adjusted however limiting the number of years would be the crucial point.
It would limit the power grid lock we now see today.
Anyone serving over a decade is part of the problem not the solution.