Seems like something like anxiety would be a co-morbid condition that was probably at least partially brought on by the ADHD.

I assume if you had some sort of agenda where you wanted fewer people diagnosed with ADHD you could probably swap the dx to anxiety in a lot of cases pretty easily.