Change the 22nd amendment to state, “No person shall be elected to the office of the President for more than two consecutive terms.”
If you have an individual who has done a great job as President, you shouldn’t, after 8 years, have to say, “Thanks and good bye.” That individual, after a mandated 4-year break, should be allowed to seek that office again, should he or she decide to do so.
This would accomplish two things: It would continue to safeguard against a monarchy (the original intent of the 22nd Amendment.) And, it would allow the people to bring back an experienced and proven leader who could offer continuity on the world stage.