Big Dave

Quick question

When I use option 1, should I install the tee after the SWCG to prevent the warm water from going thru the SWCG? I was also thinking of eliminating the tee and add a second 3 way valve? What do you think?

Thank you
Eddie