Guys, I wanted to thank you all for your very helpful comments and advice. When CORGI refer to 'competent' engineers I'm sure they are referring to people like yourselves.
If any of you feel I should be looking to change my pipework in the short, medium, long term then please say so and I'll...