I would definitely go to the doctor's, especially if you have an infection. They might be able to help you with your vaginismus, too. I've heard of women using dilators to slowly stretch the vagina out. I also would talk to your therapist about it because right now you're caught in a very vicious cycle. You get anxious about it hurting so you tighten up, which causes it to hurt more, so the next time you get even more anxious and tighten up even more and it hurts even more. I think a T, possibly a sex therapist, will be able to help you think of ways to relax and become less anxious.
You're not alone out there.
Take care