You might want to run a wire from the corner lamp to the city light in the headlight reflector. Otherwise it's just a matter of moving pins from the old 4-pin connector to the 6-pin connector.

You determine the wattage of the H4 main bulb and H1 fog/driving bulb. Stick with 55 watts and you won't have to worry about wiring capacity. You can get bulbs to 130 watts or more. Anything above 70-75 watts requires relays and heavier gauge wire.

Sixto
87 300D