I do recommend switching to tea. Anecdotally I do feel better on tea than coffee, but coffee has a long-lasting addictive pull. I guess it's a good time to quit coffee again.