Not OP, but I have a small AA/14500 flashlight I can clip to my hat, so usually I dont need a dedicated headlamp.
I carry a second flashlight in my backpack that has 5000mah 21700 cell, USB C port, and has a powerbank function. It also has a silicone diffusor for lantern use and a magnet (Wurkkos TS21, can recommend)