An update. The diode near the alternator loom was gone, bridged that and now the headlamps stay on with ignition on. Other diodes are ok.
Cleaned and connected up all the grounding points, now the wipers work fine without disturbing the headlights.
Still the headlights are playing up. Left lamp turns on when stalk is in second click position, no high bean when stalk is pulled back, main beam cuts out and no high beam. Right lamp shows no lights at all.
Both diodes are ok. Any clues people? Tim mate any chance i can borrow your stalk?