OS2, it sounds like you are handling things well, so good job in not just rolling out the red carpet and standing at the end with open arms. She is NOT ready to come back to the M. All the stuff she's telling you is "you are still Plan B, but I'm not sure if Plan A is going to work out so I might be interested in falling back to Plan B if I have to." And no, that is not acceptable. YOU need to be Plan A in her eyes, not just a safety net.
And all of this stuff she's agreeing to, don't believe it for a second. I think she's just trying to manipulate you, it's not genuine. She may be on her way to really wanting the M again, but she hasn't hit rock bottom yet.