+1 for the knog pwr range. I’ve got a road attached underneath my head unit, battery lasts ages for the size (3350wh) and you can charge up your phone or head unit if you’re in dire straits.
If you’re interested in a helmet mounted light, Gloworm from NZ makes really good compact units with an external battery pack that you can pop in a jersey pocket.