I used Hella and mine has a hallogen bulb and is ok for compliance (i started off caring about that stuff)
Narva also has a similar product usually at a lower price
Both companies have chrome rings to suit the headlights and both have online catalogues - I jotted down the part # and went to the local Burson's and they called me back in a couple of days with the bits.
http://narva.com.au/
http://db.hella.com.au/cgi-bin/catalogue-hkg.pl
LoBelly