I personally find your post very interesting, I'm not sure it will help, but I'll share my story anyway.
I have never really been what I would call a social person my entire life, but for the past 2 years my social anxiety got worse and worse. It started off where I just a little nervous going places and by the end I constantly felt like people were staring at me, anytime I went into a public place (even if it was empty) I would get so nervous, start sweating like mad and have a panic attack.
I had some horrible panic attacks, thought I was having a heart attack, had 3 EKGs, a stress test and a nuclear heart scan but my heart checked out fine. My doctor finally figured out they were panic attacks and put me on Buspar and got me into therapy sessions. When I started therapy, I had no plans or thoughts of dealing with any gender issues; despite an earlier failed transition, at the time I was occasionally crossdressing and I was OK with that (or so I thought).
The deeper we got into therapy the more clear it became that the gender issues were actually causing most of my anxiety. Although I was completely unaware of it, the negative view and thoughts I thought everyone else had of me were really my own thoughts.
I know it sounds comepletely crazy, it still does to me sometimes, but as soon as I started dealing with my gender issues and rolling with transition, I'd say 95% of my anxiety went away.
Things might not be the same at all in your case, but before I got into therapy I would have never imagined how much my GID influenced my social anxiety. Anyway, get going with therapy, it may take a couple tries with meds to help, I feel that medication was very helpful in my case, but at best it only helped to take the edge off enough to be able to see things a little clearer. I have been very happy with the Buspar though, took about 3 weeks for me to feel anything from it.
Hope there is something helpful in there, I ramble.

~Sara