Subbing in NiMH could be easy enough. And you never know, you may want to make a usable setup to "loan" to people that you want to night ride with you some time.
PM more info about them if you want to sell them. I'd like another light that has a hot spot - so i can aim it at on coming cars.