There may be another possible solution to the headlight upgrade. I sent a few emails to Daniel Stern
http://lighting.mbz.org/ and he indicated that the H2 has a standard 7" headlight, and that it is possible to replace the headlight with an E-Code Cibie headlamp, which uses a replaceable H4 bulb.
I bought a set of Cibie E-Codes from him years ago for my Corvette, and it was well worth it. I am seriously considering this upgrade.
Klaus