Nitefighter bt70 from a year or two ago on the bars.
Lumenator (MTBBatteries) on the helmet.
The BT70 claims 2800lumens, I think it might be first/only chinese light to undersell itself, the amount of light it kicks out on high is frankly indecent. It’s a lot more than ~50% brighter than the Lumenator, with the plain (spot) lense in it actually hurts to look at the trail! The diffuser gives it a beam patter that pretty much fills your field of vision except on tight switchbacks.
Still got my original Magicshine-P7 and magicshine rear light for commuting.
Current batteries are the Nitefighter (panasonic cells and heavy gauge wiring), and a solarstorm type waterproof case with Samsung cells charged via a nitecore charger.