I'd take a look at the H4 and H7 bulbs from
PIAA
PIAA
ive got the H3's in my headlight unit and im extremely happy with the brightness of these bulbs, a little on the spendy side but worth it to me, i want to beable to see and be seen and these do the job quite nicely. Here take a look at...