The ASD and ADHD diagnostic criteria are still too broad and imprecise. I welcome DSM-V's changes from discrete Autism conditions to having an actual spectrum - but I feel the same should be done for ADHD because so many of ADHD's diagnostic criteria, even for the "Inattentive type" (let alone the Hyperactive-type) really don't apply to me.
I know a lot of people in real-life in geeky/nerdy fan subcultures and so many of them exhibit those "odd" behavioral traits of ASD - and I've asked them about it and they tell me they got tested for ASD but got an ADHD diagnosis instead - and I don't like that, because the diagnostic criteria for ADHD in the DSM doesn't really cover non-normative social behaviour at all (that's ASD's territory).
In summary: more research is needed!