If you don't mind spending an hour or two with a soldering iron, you can almost certainly replace the battery on your existing light for a fraction of the cost by going and getting the cells at batteryspace.com
__________________
Work: the 8 hours that separates bike rides.