I actually think you would be wise to stick with your current T, not primarily for the reasons you are mentioning here although they do contribute, but because I think you need a T with really firm boundaries. Jmo. If you need more support then you could find additional support like with the DBT group.