http://learninfreedom.org/Nobel_hates_school.html
and while it is indisputable that Einstein blew off some of his school homework, it is not at all clear that he would meet any of the DSM-IV or new DSM-5 diagnostic criteria for any of the conditions claimed for him.
More generally, there is a better call for improvement of psychological diagnosis
http://www.nimh.nih.gov/about/director/2013/transforming-dia...
already up on the website of the National Institute of Mental Health in the United States, the subject of much news reporting and commentary in the last week. So I won't take this opinion piece by lone blogger as the last word on what needs to be done to improve psychological diagnosis.