I think the idea of more self discipline is a good one. Many many medications do not work in the long term, that is why they keep coming out with newer drugs for depression, anxiety, etc, and most have side effects best avoided.
Mental self discipline worked for me in the form of cognitive therapy, which helps one realize how much their thoughts (over which we have control) affect our emotions and even physiological reactions.
It takes time though, so maybe some anti anxiety help in the form of medication while in therapy might be the ticket.
Cognitive therapy was the best thing I ever found after decades of being medicated here and there.