I remember looking at aftermarket headlamp switches at Stafford show last year and being struck by the fact that there were several different designs/configurations of pins available which all looked exactly the same from the switch side. Add to this the confusions presented by an aftermarket loom and the confusions just increase.
My advice would be to throw away your existing wiring diagram as it will only lead to confusion and frustration and, armed with a multimeter, stick to basic logic. You know that the first switch position should turn the pilot light, instrument light and tail light on. Therefore look at the switch to see which terminals need to be connected in order to make this (and nothing else) happen. Use your meter to identify which of the wires coming off the loom are connected to these lamps and connect them accordingly. Repeat the process for the other switch positions, remembering that you want the pilot light to go off when the headlamp bulb is on either dipped or main beam. Ensure that brake and tail lamp are functioning correctly and before screwing the switch back into place take a photo of what you have done for future reference!
Warning though... There is a lot of current flowing through the ammeter connectors and it is VERY easy to accidentally touch these onto the headlamp casing when you are fitting/removing the switch causing a violent short and lots of sparks. It's just one of the perils of working with a live circuit!