All fixed now.
Turned out to be easier to leave both heads in place, due to the way the wiring & connectors are made. Just swapped over a couple of connectors and it all seems to work well now. I'll give it a run tomorrow to make sure.
Thanks for the help.