@runner101 - It is understandable the worry about ADHD being over diagnosed and over medicated but their are also many great stories out there such as my husband's story.
He was not diagnosed until he was in his late 20's and it has changed his life. He has no difficulty taking his medicine, because he feels the difference it makes.
And as far as over medicating kids, in the school system I work for, the stories I have heard sound as though parents worry about this as well. They understandably worry about their child being a 'zombie' and at the first signs of any lethargy they completely take their child off the medication.
However my husband has told me that finding the right prescription and amount of medication is a process, so it can take quite a few tries from what I have heard.
Also, you mentioned about testing for ADD and if it had gotten better.
When my husband was tested for ADHD the doctor was an ADHD specialist and had a computer test where my husband was told to press a certain key if he saw certain things and not to press a certain key when he saw, I think, an X. So maybe they have come along farther with the tests or maybe something like this is still cutting edge.