Your T has been really inconsistent with boundaries and insensitive with you. I think you will definitely be better off with a more professional T. I know she is sometimes helpful too which makes things even more confusing. If you aren't sure about leaving you can always start looking at new Ts now while you are deciding whether or not to stay. Unfortunately it isn't surprising your last bad T's supervisor, your current T, is also not a good T. The apple doesn't fall far from the tree sadly. Are you going to look for a client centered T? It sounds like that is the type of T you would like from things you've said. While there are no perfect Ts there are good ones out there and you can find a good one. You deserve a T that is professional and competent. Please don't shortchange yourself.