It really comes down to the conditions in which you dive, and the use you have for the light.
The new Salvo fixed-focus 10W HID is a very nice light at a reasonable price. The brightness is almost comparable to my 21W, although the "spill" of light is not as much. The battery life is far longer.
I think the Salvo variable-focus 21W HID light is just about perfect. You can blur it out for night diving, focus it for punching though murk, and three of them in a cave makes it almost like diving in the daytime

The battery life is long enough to be very useful, and Salvo uses the Brightstar (less fragile) bulb in all their HIDs. Not to mention that Salvo's customer service ROCKS.