Water issue

Perhaps a photo would enable helpers to sort out your valves. On my C there is a two position valve at the pump inlet, selecting water from the tank or from a hose that I put in a jug of antifreeze when winterizing. There are also two valves at the hot water tank so water flow can bypass the tank when winterizing or not when you want the water to go through the tank.