I've been using this brand. They contain a removable 18650 lithium ion cell so you can replace the battery for very cheap when it wears out. USB-C charging too. You also have the option of carrying multiple cells and swapping them out as they run low.
https://towildbikes.com/
A former co-worker has their front light, it is HEAVY! like the old lights with seperate batteries heavy. Also quite bulky but he said it worked well and the beam pattern seemed decent enough in my short test in my hand.