There are non-habit forming treatment options for ADHD/ADD.

Pharmacological treatments include: Wellbutrin, Straterra, and Intuniv.
Behavioral therapies, as with other mental health disorders, can also be quite effective.

Certainly stimulants tend to have the best sucess, but of course it's a risk-benefit thing to consider.