I think you should try therapy again... after all, it HAS been helpful in some way to you, right?
I know it can feel uncomfortable sometimes.. but it's normal, you're getting through a lot of persona, deep stuff after all.
If you think it's the therapist's fault, maybe you can try another one?

Either way, welcome and good luck