I have started a relay wiring project with the rest of the new wiring (from my truck in a bucket). So you buy the Cibie, it's a reflector and then buy an H4 bulb? I remember Sylvania makes a killer H4. I see they also have a DOT version -
https://www.ebay.com/itm/H4-Headligh...8AAOSwdGpZi63o
And there is room, no modifications to the bulb housing and sheet-metal?