Moved by @Nickfromwales and @PeterW to keep things on track...     I'll start a TS thread sometime. Need to do a drawing as points of use, boiler etc are some distance from each other so it might serve better to alter their positions anyway. Everywhere there's pipework the easiest rather than best route has been taken.