gas_man_gaz - Thank you. I'll try setting the preheat to zero to see if that helps (with one of the problems anyway).
linkyplumb - Thank you also. To clarify the problem, when the dial is set to hot water only, even after we've finished drawing the hot water, if we've forgotten to turn the...