Always be prepared for the worst. That may sound negative, but being prepared is your objective. For example, there will be a day that your body or mind will refuse to cooperate with this new regiment and will want to fall back into those old patterns. If you do not have a back-up plan, then you could feel hopeless and want to give up trying. However, if you know that you'll have those times....and have a plan in place....then I believe that will help pull you out and continue.
If you continue with all that you've written, you will be busy and it should help get your entire focus off W. Be sure that you have some time that is "fun" for you.
Don't expect her to fall in step and work as hard as you are doing. A W who wants out of the M has no desire to work at saving it. She doesn't want to hear about it. So, you can come here and tell us, but she will have to "see" the results.
It is not about what you feel should work in your M. It is about doing the work that gets the right results. Do what works!