LED is coming but doesn't seem quite ready for prime time. 21 watt HID is too much for wrecks - no big rooms and that close you really run the chance of blinding your team or yourself. 10 watt HID is too little for caves - not enough light for big rooms, etc. 18 watt HID would seem to be a fair compromise. Focusability is critical in either environment.
NiMH batteries are the standout best solution for a number of reasons: smaller, lighter, no memory issues, etc. 4 hours burn time on an 18 watt light means you need at least 9 amp hours of juice and I'd be looking for either a larger battery or two smaller ones and some wet connectors on the cable.
As to the manufacturer, I don't think it makes all that much difference in terms of quality.

11:
INCOMING 
) Take a look at Halcyon, Dive Rite, Sartek and see what kind of price and local service you can get. Make sure you have a collar around the switch (Sartek doesn't automatically come with one but will install one if asked) and buy an extra bulb right away - it's usually a good time to negotiate a price and, sooner or later, you're going to need it.
I've tried Halcyon and Little Johnson back-up lights and have had repeated problems with the screw-on design in both - finding a balance between a reliable seal and a light that turns itself on in response to pressure is an ongoing struggle. I don't know why a reliable pressure switch is such a problem but I've been carrying a little UK SL4 (yeah, overdriven, I know) as a third back-up, just in case.