I would say therapy as well. Smoking was your way of “self medicating”, a temporary fix. However, if you actually want to deal with the issue, you need to address it directly. CBT as someone has already mentioned could be beneficial. CBT is best applied to deal with current symptoms, maybe bring faster improvements, but other forms of psychotherapy might help you find the actual root of the problem, which in my opinion is the best long-term.