I managed to find a source in Europe for the Cibie H4/H1 lights. I didn't want to get the Hella or Bosh Euro lights because they don't have replacable lenses. Including shipping and such I spent about $450. I just found out that I have to get some brackets to make these things fit... gonna cost me another $150 :-(
Here are some shots of the Blau wiring harness. I made a few modifications to it to allow the H1 and H4 hi beams to come on with the hi beam switch. The defualt behavior is for only the H4 hi to come on (the h1 was wired with a separate switch!). I also added more split loom and a few plastic "T"'s to neaten it up.