About the Magic of Making Up stuff, it's exactly the same as DB. The difference is that they recommend going dark for 1 month (at least) and then calling up the partner for coffee to "re-connect".
So like DB says, go dark, GAL and then if you're up to it, re-connect with W. In your case, I would stick with the GAL and not have as much contact with the W as possible. Live your life first then see if the W wants to be a part of it.
M-43 W-40 2D - 9 and 5
Emotion, yet peace. Ignorance, yet knowledge. Passion, yet serenity. Chaos, yet harmony. Death, yet a new life.