You should ask your doctor about Intuniv. It's a non-stimulant option only approved for ADHD in children in the US right now, but my psychiatrist has been using it off-label with adults pretty successfully.
In my experience, I've found it to be a very pleasing but subtle option, and when taken with stimulants, reduced some of the unwanted side effects I experienced. The only negative side effect I had from Intuniv was noticeable hypotension, but since I didn't experience much ADHD-related change between doses, I probably could have stepped down to a lower dosage to combat that. I only stopped because I was trying to get pregnant, and once it's okay again, I'll start back on Intuniv most likely :)
There's also Strattera, though I have no personal experience with that.