So just as a final update, had a great experience with Shearwater APAC (in New Zealand). They checked the serial number and found it was manufactured in Jan 2021and so was technically out of warranty. However, they told me they stand behind their product and sent me a preprinted Fed-Ex label and I shipped it back to them for less than USD$10. They serviced it, tested it, fixed a sticky button, replaced the battery and sent it back to me all in less than 2 weeks all under warranty conditions. Its been 6 days since last charge and is still sitting pretty at 100%. Unbelievable customer service!