The battery is a deal breaker.
Get rid of the built in charging circuit and just make the light shorter.
Even better, a 3.7 volt rechargeable CR2 15270 would be much preferred over the crazy 14300 cell.