Ok. The plumber came out and instead of fitting valves to each tap area, he fitted one way to the pipe feeding the hot water cylinder.
One on the cold water feed to the cylinder from the cold water tank, and one to the hot water feed from the cylinder to the taps.
All well - then...