Get the euro lens assembly if you want to stay with the stock light housing. It has better optics than the US version. You could do the HID conversion to that housing also.
The Baja Designs 6" HID Pre Runner light can be installed to the stock mounting points with a bit of work. Lots of light output but you give up hi/low.
"You can follow me, but it's gonna hurt"