Just a quick note, the LED in the switch is lit so there is power at the switch.
I have found that the twisted pair in the circuit is not the colours noted on the schematic.
This makes me wonder if the yellow/green wire is correctly identified.