This sounds almost exactly the set up I have, except there is a thermostat on the hot water tank.
Good news is that I think I've fixed it, the plumber looked to have wired the valve back in incorrectly. Now either thermostat can bring the boiler on, but the hot water tank will be heated...