A 47-year-old woman attends for a periodic health examination. She has a BMI of 31 kg/m² and a family history of type 2 diabetes. Fasting plasma glucose is 7.4 mmol/L on two separate occasions, and HbA1c is 7.1% (54 mmol/mol). According to Diabetes Canada diagnostic criteria, which diagnosis is most appropriate?