Many people have had success with stimulants and Tenex to augment the stimulant...the stims help with focus and school work and somewhat with the impulsiveness, and the Tenex (guanfacine) helps more with anxiety and impulsiveness and also aids in sleep and weight issues.
You might want to ask your doctor about adding the tenex and see if that helps with the added anxiety the stims cause...