I say "quality" sleep because think I had minor sleep apnea for years and if you have anything like that going on, it won't matter if you get 8 or even 10 hours per night of sleep. As far as medication:
- Stimulant meds were like a magic cure at first, but over time they lost efficacy and they made me more high-strung
- Modafinil (if you can get it) is a little less effective for ADHD but seems to have less downsides
Lastly, you may wish to consider treating anxiety as well. After years of semi-successfully treating ADHD directly I came to the conclusion that I had an anxiety issue as well. I'm not exactly an "anxious person" but even a little bit of anxiety really screws with my ADHD and can create a downward spiral.