Supply and return valve should not pass together in same tank. If this happens, supply and return water temperature will equalize and it will be suplied to chiller which is not efficient. Having buffer tank is a good idea especially treating condenser water.
thanks,
erwinpetiluna
