I am still rocking the MBP 2015 and recently changed the battery. Did you consider doing the same? That is, updating batteries instead of getting the new ones?