I diagnosed myself with AvPD...I feel like I fit it pretty well. My therapist, who I've been seeing for 6 months, as un-diagnosed me and says I have social anxiety. We argue about this almost every week, lol.