I like your plan. The details on mine would be 12 years tops in Congress - total. That means if you're in the House and want to be in the Senate, your total service could not total more than 12 years. Then add the 2 terms for President and nobody could ever spend more than 20 years in elected Federal office. SCOTUS should simply be a 20 year appointment staggered at intervals to insure that one 8 term president could only change 5 Justices. I think you are spot on about Federal jobs, too, but only for management.
Yours is very good too. I would like to add one further restriction to my twelve year limitation to government employment. That would be to prohibit anyone with a law degree from running for any office. (conflict of interest)
But.....since we know that the proposal would be construed as discriminatory.....lets repeal all discrimination laws while we're at it. LOL! Folks, I'm just kidding!