A 73 yr asymptomatic non-obese male K/C/O HTN & DM came in my OPD for routine check up. FBS-144mg/dl, PP2BS-240 mg/dl,  S Creatinine-1.77, Urine Protein-Trace, Lipid Profile-N, EGFR-37.

The patient is currently taking Tab Amlodipine + Atenolol once daily and had stop taking medication for diabetes since a long time. Please suggest which oral antidiabetic agent to start with considering raised S-Creatinine and whether to change Anti HTN agent to ACE inhibitors/ARB in this case.