Does my son have Asperger's?

My son is 6 1/2 years old. He is very sweet, and  is very fun to be around. He is most comfortable around adults (especially women). He developed normally as a toddler, maybe a little slower than normal with speech but not by much. When he was around his 5th birthday we noticed that he had problems with focus. It was apparent that he was having trouble making friends at preschool and that academacly he was behind. He also began to show signs of anxiety, (scared that  his little sister might get hurt, scared if he swallows ocean water at the beach he will die...). My pediatrian felt we needed to evaluate him for ADD/HD. We did the appropriate surveys (myself, my husband, his grandma, and his teacher) and felt he has ADD. We have since put him on non-stimulant meds for ADD and have seen a big improvement in him. He is doing average in school and more likely to have positive social interactions. He still has some anxiety and is afraid of getting in trouble in school. He is not making friends like I would like him to. I took him to a psychiatrist who said he didn't think he had asperger's , but rather ADD some anxiety and shyness. There is a child with Autism in his 1st grade class, this child has an aid with him at all times. My son likes to be with this child and his aid. I don't know if he is drawn to this child because they are both on the spectrum, or he enjoys the adult ineration, or that the relationship is less challenging than a relationship with a typical child, or all of these reasons combined.
My son loves to play, tease and rough house. I don't believe he has apserger's but sometimes I second guess myself. I don't want to miss something and deprive him of intervention. Help

[espadrille]

It does appear to me that he has traits but then a lot of us do.
I have As and have a son on the spectrum also