Ok, thanks for all the replies, it was very much appreciated! diynot to the rescue again.
All fixed now!
Took all wires out and redid them following advice above, and hey presto, all working nicely!
Used multimeter to work out which cable was "light 2", and it was also the red from Switch that...