Looks like you were right actually:).
Ive got it back from the garage and they sorted the badly wired switch. But when dropping off the Defender with them, they did suggest exactly what you said, and it seems you were correct, they diagnosed a kinked accelerator cable which has now been...