Done! All the old wiring out, new wire harness installed and everything working. There's one page in the factory assembly manual that was invaluable in showing the wiring of the headlight switch, instrument clusters and ignition switch.
You should have seen the condition of the original wiring, there was more bare wire than you can imagine, and yet everything worked except the right high beam headlight!
Thanks everyone for responding.
