If I was in that situation and there wasn't a real fix, I'd look into seeing if there's space to mod in a physical switch in-line with the battery.