Here is a unique idea that I recently saw employed that might solve your problem...
Since you want to take all the water in the PW loop to whichever tank has the demand (or I suppose both if required), you might make a relatively small, valved, by-pass connection between the PW supply and the...
