Hi,
What you are going through is a very common symptom of ADHD. I personally face it everyday and it can be quite annoying. The two comments above seem to really answer your post so I just wanted to mention a quick comment. I also had severe anxiety and the two medications you mention in your post also flared up my anxiety. Only I didn’t figure out the cause of it for years. It might be beneficial to try Adderall. I have been on Adderall for over 6 months now and I don’t experience any anxiety which is beyond a miracle. So, it might be worth a try.
Good luck!