Yes, definitely could do with few more options in small headlamp area.
Here's a list of smaller headlamps, that should take lithium primaries.

Flashlights @ Parametrek.com

I disregard all plastic bodied ones, not a fan.