RD&G, have you checked your battery voltage, both static & under load whilst cranking ?

Although many last longer, a 2016's battery may be failing


Jon M