Lots of good points. Just want to point out that this can quickly become another self improvement project with its own sources of stress, insecurity and so forth.
In Tibetan Buddhism, there is a lojong slogan: "Self-liberate even the antidote". It refers to exactly this -- the practices we use to get away from bad habits may themselves become bad habits. Rather than embarking on an infinitely recursive run of trying to stop self-improving, just don't be black-and-white about things.
One source (of many): https://medium.com/kaitlynschatch/lojong-practice-journal-se...