Don’t give up on term limits. See my post #35.
The grandfathering process has a great deal of merit.
Term limits is the fundamental mechanism for draining the Swamp. Grandfathering would protect current alligators, who have no interest at all in future alligators.
Has to be a constitutional amendment - certainly worth a try.