As I see you already fell back to tea as a replacement, does that somehow help and work at least against that kind of being nervous in social situations? (Had that effect much more back ages ago when I gave up on cigarettes, that was challenging as well.) Personally, having people around me drinking coffee usually helps better staying away from it because in most of these situations it boils down to the coffee being mediocre to outright bad (like, the usual office-meetings-coffee brewed in the morning and consumed until late afternoon). 🙈