OK, news update.

Turns out that the little ball bearing that is inside the toggle part of the switch was covered in muck. So after a full "socks and undies" clean and reassemble, I have indicators again.

The headlights seem to be another issue entirely, so after some careful reading of the tech wiki, I think I am going to abandon the factory wiring all together and go down the relay route. Looks to be a better option, and at least I dont have to tear any more hair out trying to diagnose it