Actually, no. The 22 amendment says that a person can’t be “elected” as President while the 25 amendment says that the Vice President shall become President in case of resignation. No contradiction here. So while Trump can’t be elected anymore he can still become President for unlimited terms.