Maybe this is a silly question, but are you able to/do you remove the battery when not in use? Doesn't solve the underlying issue, but you'd at least still have a functional battery.