I'm not sure what you should do, but when you talk about how hard you're going to try to keep the boundaries and remember you're "just" a client( I disagree with that idea anyway), it strikes a chord with me. My pattern. Anyone's pattern, for that matter. Part of me wanted to repeat it with4 Ts, but for sure I was NOT going to let it happen with my current T. You know the rest of my story.
Until we work through why we repeat ourselves, it's likely to happen again, even if we try hard. I'm talking about feelings for Ts, not behavior we're changing through our therapy.
I could be wrong of course, but wanted to warn you about repeating patterns. I don't think changing the T changes our wants and needs.
Good luck with whatever you decide to do.