You can have traits of all the things you list and not actually have those as your official diagnosis. Do you trust your pdoc's opinion? If so, I would ask him what your official diagnosis is. I understand completely wanting to be clear on what you *are*...I feel the same way. It does not define me, but yet it helps explain to me why I act/feel the way I do (in my case, the big one is being very OCD). And it's also extremely important in my treatment!
It sounds like it is very important for your pdoc and your T to coordinate your care so they can get on the same page. Would they be willing to speak to one another?
And btw, there are simple tests available for ADD/ADHD if you are concerned and want to get tested. I think there is testing available for Asperger's as well (now under Autism in the DSM-5, I believe.) Testing might put to rest any confusion over the diagnosis of those two things, at least.