I actually had the same problem for the first year or so of doing the dual headlight mod. killed my battery because of it to... My problem was that I ride when water freezes and below, so, naturally I am kickin heated handlebar grips and a heated jacket as well..... So, the jacket and bars have adjustments so when its my hands that are suffering and my core is fine, i adjust accordingly. I decided to install a simple inline switch that basically breaks the signal from the bike so that i can control this as well. Worked beautifully and cost me about 6 bucks and a couple connectors. The other thing I did that made even more of a difference is buy a Lion Battery :-D which can sit for a year and still have 90% charge left. Anything that adds a level of control over this bikes poor charging system is *thumbs up* by me.