I am thinking of changing my boiler and modifying the water pipes on my own. With regards to the flow and return pipes going into the hot water cylinder would I simply loop these together, cap the hot rising from the cylinder and tee off the hot on the kitchen sink? Also if the cold water storage tank is supplying water to the bathroom would I connect the cold mains into the tank onto the outlet of the same tank?