To bring the two into alignment, something needs to be reframed. You can either convince your subconscious that the current behavior is detrimental, or preferably, just how beneficial the alternate, desired behavior will be.
Hypnotherapy, self-hypnosis and NLP are probably the best ways to accomplish that.
When I quit a 2-pack-a-day habit 24 years ago, it wasn't through "self-control and discipline" but by reframing self-image from "smoker" to "non-smoker." The difference between "I will not smoke this cigarette right now" and "I am a non-smoker" maybe doesn't seem like a lot, but the difference between an action and a self-identification is significant.