I have two bathrooms on two floors and a kitchen. Just installed new gas fired heat and hot water system. Hoit water takes forever to get to faucets. Heating contractor says it is a distance problem and possibly the hot water lines are too large. Any ideas how to improve the delivery.