Have you tried supplementing L-theanine? A lot of research documents that it’s strong reduction of caffeine related anxiety, while preserving its cognitive and wakefulness benefits.