I also think it would be desirable for a third change. I think the Seventeenth Amendment should be repealed or amended to re-establish the election of US Senators by the state legislatures rather than the population at large. I think that would strengthen the Ninth and Tenth Amendments considerably by empowering state governments.
And frankly, I am very opposed to term limits. I think each state should make that determination for themselves.