Training-wise, T1 sounds better on paper. However, having read your situation with each of these Ts and to answer your question..

I would stick with T2 as it would work (for me) to have someone who got me so scarily accurately by being so tuned in to me.

The lack of transference and wanting to show my best face to T2 would also help me be more... honest. Which seems to be something you can't do with T1.

Finally, I believe that feeling better will, in the long run, spill over onto taking action and hence, do better. This is why I would go for T2.