It all sounds good, Mike,
Who knows what she will choose to do, but as long as YOU are doing the right stuff, you will be able to sleep at night. I think it was the right thing to do to spell it out for her, and especially to make it clear that you will do x, y, and z, and that you will do that regardless of what she does. No carrot, no stick. What she does is for her own sake.
Good job! Enjoy the shore--I won't be relaxing on the beach until next year.