I'm not sure what my bike has as it's a kind of "put together" headlight and mini fairing. But the headlight is an E-code, which is European and is vastly superior to any DOT headlight.
I have a set of E-codes on my Jeep and I would like to find a set for my Jetta, but they are big $.
The E-codes feature a prominent horizontal cut off with a flare up and to the right (to illuminate road signs). They are properly designed to put the light where you need it. You can run hot bulbs (90w100w) without blinding oncoming traffic, and they are just better in every way.
If you run a hot bulb you will have to upgrade to a relay harness as the stock wiring is not robust enough to handle that kind of load. And generally a harness will increase voltage at the bulb on a stock system which should give brighter light. So even a stock system can benefit from a harness set up.
I make up relay harnesses for everything too. Pretty easy and you can use all of the stock switches and stuff to trigger the harness. Also replace the hokey headlight socket with a hi-temp unit from the autoparts store.
You might look here
http://www.danielsternlighting.com/ He has a 200mm Cibie E-code you could use. Lots of useful info too.