I'm a bit of a fan boy when it comes to Magicshine, and currently own almost all their lights. I've reviewed them on Youtube/website as well if you want more information about them. They have larger mountain bike lights with external battery packs and all-in-one commuter style lights.

Personally, I really like the external battery pack lights like the Eagle F3 as you can keep using the headlight even after the batteries die by replacing the battery pack. There are other lights like the Fenix BC21R v2 that also have replaceable 18650 cells. That makes it pretty easy to carry extra batteries in case you run out of power mid ride.