Hazards and indicators...............again

Hi guys. know this topic's been done to death but I'm still losing the battle (and the will to live)
As I've mentioned before mine's an ex military 90 but I assume the hazards etc are all wired similarly.
Here are a couple of pics that might help.

Can anyone confirm what goes where. Have changed switch and relay as ended up just buzzing when I tried to indicate. not gone to extent of tracing all way to fusebox yet (scared of spaghetti) but stripped out the crap from switch to connector.

I'd get rid of the military connector Mate and trace them back to the fuse box. What problems are you having with the LEDs?

As Coffeelandy says, probably an idea to ditch the military plug(s) and re-work everything from the fuse box to mirror a conventional set-up. I had a similar issue a few years back with a Sankey that I was attempting to configure - I ended-up ditching the lot and re-wiring from scratch.