Being anxious out of self-inovated things are related to social anxiety, I think. I've got some the problems you mentioned. Meanwhile, I'm also 100% confident that I'm an AVPD. Maybe social anxiety is a reason for AVPD, maybe.