Just a final note - I hope it is working now.
I tried a new solenoid on the pump, having removed the apparently redundant valve. The result of this was to show that the valve on the pump was jammed open, and presumably the extra valve was to "cure" this. The failure I had was in the second...