I don't know if you are aware of this but they do make the rectangle headlamp that takes H4 bulbs. Cibie, Hella and Bosch are the better ones but there are a number of ones out there that may work as well.
What ever you do, don't put those d*mn 75 watt low beams in the headlamp, it is a good...