Have you tried a non-stimulant med? I had some similar issues with stimulant medication- increased mood swings and irritability while on them. I didn't get that when I was on Strattera, but I felt that the Strattera was not strong enough to control my ADHD symptoms.