ADD and anxiety

I was just diagnosed as having ADD along with moderate anxiety.  Before I was just labeled as having generalized anxiety. Almost everyone I know who has taken some form of anxiety meds have shown some weight gain!  This is terrible as I gained 30lbs on Lexapro.  It did seem to ease the general anxiety, but now I have a whole other issue to deal with, social anxiety and low self-esteem due to the extra weight.  I don't even feel like going out with my friends anymore, because I feel very uncomfortable, and my anxiety and nerves get the best of me and I end up leaving somewhere with my friends with a stomachache.  Anyone had luck finding one that doesn't seem to effect your weight as much?
I'm not sure if I have the anxiety, and stomach problems due to the ADD. Has it been untreated so long that I have the other repercussions?   I try very hard to stay focused all day at work, remember things, arrive on time, not be as restless, watch what I say, be a good friend, a good fiancee, etc.  I have felt and been like this for a long while and I tend to overanalyze everything until I make myself sick.  Sometimes I feel trapped in my own overwhelming thoughts.  
My doctor wants me to think about the treatment I would like to pursue, as of what medication to take.  I really want to do better at my job, and to be able to relax, and just be me.  I would like to know any advice of what meds I could try to help me with my ADD and anxiety.  

[Roger Gould, M.D.]

It's not clear from your description about what diagnosis is helpful in determining which medications.  The safest course to ask your doctor about is low doses of klonopin to reduce your anxiety first, then see what symptoms remain. There is no weight gain with that medication, but you may be stress eating, if so, read my blog re emotional eating.