Looking for a quality AA headlamp that's not too bulky

I'm thinking I might be in the market for a new headlamp (got a $75 gift certificate I need to use before it expires).

For the last 6 years I've had the Petzl Tikka Plus. Great light I only have two complaints. Its a bit on the dim side and it runs off of AAA's. Everything else in my pack runs off of AA batteries, so it's a bit of a pain to pack extra batteries for this one device.

The Petzl Tikka XP would be my top pick if It ran off of AA batteries and I still might pick one up, but I'd like to find something similar that does not use AAA.
http://www.rei.com/product/751760

Basically I'm looking for a AA headlamp that isn't much bulkier than the Tikka (the 4 AA models are too big). It has to be rugged and water resistant as well as bright. The ability to switch between a floodlight for camp and a beam for hiking is also a plus. The Mammut Lucido TX1 seems to meet these criteria, but I've never seen one before so don't know anything other than it doesn't look too big and it runs off of AA. http://www.rei.com/product/775033