Aftermarket headlight suggestions?

[jvitzu]

I've got a yellow '04 w/ black accents and I'd like to replace the headlight & fairing.  I was looking at the Raptor II, but I can't google up any wiring or mounting information on it or testimonials from buyers.  

http://moto-madness.com/catalog/index.php?main_page=product_info&cPath=7_337&products_id=302

Anyone have recommendations for an aftermarket headlamp & fairing combo?  Fairing doesn't have to be huge - just something to protect the guages

In case you didn't guess, the lower fairing is gone.

[werase643]

turn signals have 2 wires....don't matter what way you hook them up
head light has 3 wires   matters but easy to figure out
35 watt bulbs suck at night
stock is 55 watt