OK, when I went to put the enclosure back in it's normal place, I found out the extra piece of heatshrink on the connectors is making them stick out too much, which means they are being pushed against the wall. What I need is some right angled variations on the plugs.

I found the 4 pin here but I can't seem to find the 2 pin in the UK. (I did find them here but would prefer to order from UK if possible) Has anyone come across these anywhere in the UK?

I suppose the other option is to replace them all with another type of plug/socket.