I would go for the headlamp, BUT and that is a sir mix-a-lot sized BUTT, the egronomics of a headlamp are much more critical, go to a store where you can try the switches, wear gloves if you are a glove wearer, and see what works. or go as cheap as you can, and learn what you like and don't like, maybe buy a couple different cheap ones to see which style works for you. do you prefer spot, or flood? do you want both? extra colors, modes? there is a light for everyone on the market it seems.
I've been stuck with a black diamond icon even though I'd prefer a smaller headlamp, just because the switch works for me all the time, every time, and I haven't found one that works as well. That said, its a great light, but having 3AAs hanging off the back of your head is annoying. but the batteries go stale before I use them up, so run-time is no issue, in fact unless your light is trying really hard to be bright (like all the "tactical" flashights) runtime should be no big deal with an LED light.
I did see one of the newer Pelican headsup light LEDs that had a very good switch, and I'll probably get one eventually, but it was single mode, which you might not like. Its a huge preference thing. I've passed on many lights because they didn't feel right to me. Don't just go on someone else's opinion of a light.