Let me get this straight, the Democrats really want to set-up an Obama v. Trump race in 2024?
Trump would crush him.
The 22nd Amendment specifically said, "But this Article shall not apply to any person holding the office of President when this Article was proposed by Congress..." So they could incorporate identical language in the new amendment so anyone holding the office when it was proposed could not take advantage of it.