You mentioned staying off caffeine, but recommended teas that both (usually) contain caffeine. Not trying to be a jerk, but genuinely curious - is the caffeine from tea better for the body than the caffeine from coffee? Or did you mean decaffeinated types of tea?
I also agree with the caffeine thing. The reason I stay off it is not so much the immediate effect of caffeine on anxiety (I find none), but because caffeine increases mania. Ultimately mania (dealing with life frantically) causes the nervous system to respond poorly. And anxiety seems to be above all a disproportionate reaction of the sympathetic nervous system. There is also an effect on sleep regulation and a hard edge to withdrawal that can exacerbate anxiety. Incidentally, chocolate contains a related compound, but not caffeine itself. I've experimented with chocolate over what I would consider to be statistically significant periods of time, and I honestly couldn't detect any effect in moderation. Your mileage may vary.
Caffeine in tea is very different than coffee because tea has an extra substance that helps balance the negative effects of pure caffeine. This article explains it much better than me :) Personally, I've been doing Yerba Mate (the traditional way from a ghord) which has been a great substitute. I still get a good boost feeling but not the crash or jitters.
