I think there's a possibility of ADHD, but I really fear a mis-diagnosis. In reading about the criteria, he seems to be more impulsive, a little inattentive, and not very hyperactive.

The behavior chart his teacher put into place really seems to be helping. It's only been a week or so, but she says she's seeing an improvement.