Same boat as you, except running Pop!_OS, can’t wait for the Ryzen board (batch 4). I think I’ll pick up the new battery at some point. Between the increase in capacity, my current battery being down to 85% capacity, and Ryzen I’m dreaming of a 9 hour laptop.