Was at Wickes as soon as they opened, a few pounds lighter I was back home with a good length of cable.
Circuit tests confirmed there's a JB in there as the cores colours swapped as per above.
So having changed the switch, checked the connections, tested circuits and worked all this out...