A 70-year-old man with long-standing type 2 diabetes and hypertension presents with an eGFR of 40 mL/min/1.73 m² and persistent albuminuria. He is on Metformin 1 g twice daily, Amlodipine and Atorvastatin. According to Australian diabetes and kidney disease guidelines, which change in his diabetes medications is most appropriate?