That's tough to answer. I'm not diagnosed with either, although my T and I both believe that I fit avoidant - but I would never fit in with social phobia. To me, Avoidant is how I feel and think about myself, whereas social phobia (to me) is based more on a fear of others.

Like... I think I'm massively inferior. I don't act it - I learned how to behave "normally" as a survival method. I'm glad of it, because I can go out and do things and enjoy them...but there's always the "you're not good enough to be doing this. Everyone around here is going to see that and wish you weren't here" or other such thoughts. But with me... it's more of an internal thing. My thoughts and emotions fit very well with Avoidant PD - I really avoid more intimate situations that would involve sharing my true emotions and thoughts.

I'm not sure if I'm making any sense. But having an actual diagnosis doesn't matter much for me (in fact, I'd rather not have it on record). But knowing that my T believes that... WITHOUT me having brought it up first... is more than enough for me.