Job done! Everything is back together and it all works. I also cured a slight problem with one of my headlights which involved bypassing a broken wire. Not quite as British Leyland intended but it is 100% functional.