Anxiety and ADHD revisted

I wonder how many Avoidant Behaviors we have as a result of our ADHD?
My therapist, who tells me that my most presenting problem is not ADHD, says that I exhibit a lot of Avoidant Behaviors.
Well, I did some research and found that there is actually a disorder called Avoidant Personality Disorder.

Avoidants tend to shy away from situations that would cause them Psychological pain.
They may avoid parties and social situations unless they are certain that they will be liked.
They spend too much time focusing on what other people think of them that they may appear to have problems with attention. AHA! Thus, the crossover with ADHD symptoms.
COULD it be possible that I do NOT have ADHD? Could it all be anxiety after all??

The idea is both exciting and scary. Just when I think I have an answer.. just when I have gone through all the grief then acceptance that I have this so called learning disability.... I find out that it could be something else.

Or, ""shudder"" something added on top;(
The Good news is that, if the anxiety gets treated then the ADHD gets better as well, OR I no longer have problems with attention/organization.. oooooo.

Wouldn't that be awesome? Or, am I setting myself up for a fall?