Driving Lamps

[MagnaV30]

Im looking for new driving lamps for my Ranger, as the ones I have are ancient and the reflectors are degrading in them.
Also, the bulbs are H2, meaning they have a lateral mount filiment and are a royal pain in the bottom to find.

I looked at Hella, but didnt see anything that was quite what I wanted.

Now what im looking for is a square lamp that preferably is designed to run an H1 style bulb. My hope is that it is free form.
I do not want to run an H3 style like most because H3 housings do not take well to HID conversions since H3 are lateral filiment, and HID arcs are linear.

I do not care if the housing is plastic or metal, but would prefer if the lens is polycarb.

Suggestions?

 

[Sasquatch_Ryda]

Have you checked out these?

http://www.piaa.com/Lamps/Lamp-pages/410.html

 

[MagnaV30]

definately tempting, ideally I would like something of a similar size to the oem headlamps, not because I am mounting them in place of, but the current drivers I am running are only slightly smaller. Its raining and dark out right now, otherwise I would provide measurements.