Can I suggest either a MJ872 for £89 off ebay or a XML unit from £45-69.
The MJ872 would be better on your bars, as it is a largish head unit and lots a very floody spread of light, moving the Mj-808 to your helmet.
Or an XML on your helmet, as they have a great reach with there more centered beam.
EDIT: Just seen your “all in one” comment… hmmm an XML torch then, would mean swapping the battery out on longer rides (dependant on how you use the light levels) & maybe an exposure helmet mount (2fish lock block work fine but I wouldn’t describe them as quality).
Take a look at this thread, noting stoners thread linked off it (don’t be put off by the low price, I rode with the original p7 versions & it was great).