NiteCore makes good ones (actually they put their name on other manufacturer's batteries probably). They come in different capacities. I have some of the 3400mAh ones, I think they even have higher capacity than that these days.

A HEADLAMP that takes two 18650's? That's either going to be one bright son-of-a-gun, or it's going to last for 27 years continuous use per charge.