If you are woried about battery switches. I would recommend you attempt to integrate he charger and battery, from one of those manual charge flashlights. you know, the ones with the hand-crank that recharges the battery. I have a lego flashlight that uses one and it gets very good battery life, with about a minute of cranking. But i am unaware of its voltage, and I dont want to take it apart. however if it were to work I believe it could make this much more reliable.