My stock headlight got buster on the last ride and just replaced it with a model I bought from Baja Designs. I found a thread here where people bought this model http://www.bajadesigns.com/ProductDetail?ItemNumber=600002
I was finally able to install it today and it fits great. The stock bulb fits great, the new spring clip was a bit hard to snap into place but it all worked out.
It comes with a new rubber boot, but I decided to use the stock one.
the new headlight installed. You can see a bit more thru the shroud since the foam from the stock headlight is no longer there.
http://eddie98.smugmug.com/Other/Misc-Bike-Pics/i-3PhbQVr/0/L/20150307_174313-L.jpg
I didn't connect the light that came with it. I just secured the wire with a zip tie.
The new headlight installed back on the bike.