I have an odd situation with our system boiler which I'm hoping somebody can give me some advice on. We have a Baxi boiler and a British Gas UP2 controller, plus a room thermostat. In the airing cupboard there are 2x two port valves, 1 for CH and 1 for HW, plus pump and British Gas thermostat set to...