First thing I'd do is swap in another headlight switch, make sure you get one of a late MK2 with the hazzard swtch on the column though as I think they are different to the early ones!
If that don't help take the dash under tray off and check for dodgy wiring around the ignition switch, could be someone has been fiddling to bypass a knackered ignition switch.