Hopefully I am not going to need it out now.
I have left it all open in case I need to give it another go but ever since I changed the salmon relays my problems seem to have vanished.
I have the switches now though so I am good to go if the issues come back.