Hi Simon,
Mine were also shocking, which was largely down to them pointing about 6' in front of the car and also having clouded polycarbonate lenses. I did the lenses with the 3M kit, changed to Osram Nightbreakers and adjusted the elevation to where they should be and now they're great, some of the best I've had on any car. On my 2001 you can adjust with a big 8mm allen key, but I understand later models have an auto adjust that drops and needs more difficult remedial action.
You can get HID kits based on replacement bulbs which may be worth a look before considering the expense of replacing the entire units, but standard units with improved bulbs, set up properly, work quite well ;)
Hope this helps, Russ