You may want to continue to look for better treatment options. Your medication may not be right.
Additionally, Cognitive Behavioral Therapy has been huge for me. Since I was diagnosed late in life, I had just shy of 3 decades of bad habits to unlearn and replace with better ones. I still struggle with some things - punctuality, sleep schedule, for instance - but I'm far more productive and far happier.