A 65-year-old man with type 2 diabetes and hypertension attends for his annual review. He is currently taking Metformin 1g BD, Ramipril 10mg OD, and Amlodipine 10mg OD. His HbA1c is 68 mmol/mol (8.4%) and his blood pressure is 148/92 mmHg. He has a QRISK3 score of 22%. According to NICE guidelines, what is the most appropriate medication change?