Well, if NMMNG dialed you in, then you have a great head start.
Keep working on THOSE things and the confidence and self-respect will really climb.
I'm not sure if there is a thread on Catnip, but (though I haven't tried it and will) Search for that word and see what it brings up.
You keep working on being the right guy for your "next marriage" (regardless of who it will be with) and you are on fire....in a good way!
AWARENESS is half the battle. If you are aware of your tendencies and bad habits, it helps with boundaries; "true to you" actions; and detachment as well as Letting Go!
From where I see you in the forest, you are in great shape.
Remember, you are way ahead of her in the journey, (and if THIS is going to turn out with her coming back), she'll have to catch up. And you will need to lead by example.