Recently purchased Octavia L+k. Has replacement headlights with botched re-wiring, which have given me a problem. The fog lights came on when I switched on main beam switch, (fog lights switch does nothing at front).

Having just rearranged the wires so that the main beam now works instead of the fog light, I have realised it is probably not a good idea to have both filaments of the H4 bulb working together... (I assumed one would go out ...)

I have deduced that the car's electrics are intended to feed a 3 part head lamp (dip / main / fog) but the originals have been replaced with standard units with H4 bulbs (dip and main 2 filaments in one bulb).

I think the self adjust mechanism works...

Options please? I'm looking up the correct replacement units on parts suppliers, but can 3 part units be obtained to take regular (H7?) bulbs? - I don't really want to bother to convert to Xenon. Or can I stitch in a method to make the dip go out when the beam comes on (not liking that option so much). 

Any helpful suggestions will be gratefully received. 

Recently purchased Octavia L+k. Has replacement headlights with botched re-wiring, which have given me a problem. The fog lights came on when I switched on main beam switch, (fog lights switch does nothing at front).

Having just rearranged the wires so that the main beam now works instead of the fog light, I have realised it is probably not a good idea to have both filaments of the H4 bulb working together... (I assumed one would go out ...)

I have deduced that the car's electrics are intended to feed a 3 part head lamp (dip / main / fog) but the originals have been replaced with standard units with H4 bulbs (dip and main 2 filaments in one bulb).

I think the self adjust mechanism works...

Options please? I'm looking up the correct replacement units on parts suppliers, but can 3 part units be obtained to take regular (H7?) bulbs? - I don't really want to bother to convert to Xenon. Or can I stitch in a method to make the dip go out when the beam comes on (not liking that option so much). 

Any helpful suggestions will be gratefully received. 

L&K's came from factory with Xenon headlights, so I'm guessig the botch was fitting halogen lights into it?

Further on this, the L&K should have (outside to in for each unit) H3 fog light (pull rotary switch out once for front fogs, and again to get the rear fog on), plasma discharge dipped beam, and single filament halogen main. When you switch from dip to main beam, the PD should remain on, and the halogen main should also illuminate.