How about getting a light that uses external batteries. I have a night rider light that takes 3 AAA batteries. For long rides I just carry 3 spares. The key is to get really good rechargeable batteries that last. I use the eneloop pro AAA batteries that carry a 950mAh charge when most standard rechargeable only carry 750mAh.