I think we give more significance to a diagnosis than it really has sometimes. The doctor can't look at your brain and see, ah yes, this part's shrunken, obviously she's got AVPD. They can only consider your symptoms and your behavior, and choose the diagnosis they think fits the best. And different psychologists might see things differently. Sometimes a diagnosis helps people understand their own problems better, but sometimes it's just a label.

All this to say, I think you can work on coping with the symptoms that bother you, maybe through therapy or maybe in other ways, without getting too hung up on the AVPD label.