Firmware update may have actually fixed my battery issue. It’s now reporting 55% charged instead of 1%.