My takeaway: An amendment will be needed for Trump to serve his 3rd and 4th terms...
Not at all. The restriction is only on being elected President.
In 2024 Mike Pence can run for President with Donald Trump as his running mate. Then immediately after being sworn in, Pence resigns and we have 4 more glorious years of Trump.