Congrats JR on finding the gremlins. Wiring issues can be 'challenging' to resolve.
Another approach is to use Xenon filled H4's, but keet the wattage at 60/55W and , importantly, Xenon colour temp at 4300K (degrees kelvin). Just like daylight with no extra drain. Other brands around these days offering more light for same power drain (just done my daughters WQ Fiesta as a Xmas present).... a wide range available at OhSoCheap store.
CapriClinic also offer a kit of two relays to 'splice' into your existing loom near the fuse box,
without chopping your existing wiring. I have one and works fine - shows some thought had gone into working out the wiring setup for the relays for this solution. Turns the headlight/dip switch into a simple low drain 'signal' arrangement for the relay.
(Don't we all love the way the smoke comes out of the wiring insulation sometimes !!! And unexplainably !!)
Cheers,Allan
Capri V6 3000GT
....and some other pommie stuff too.....