gforce, I think that you're doing fine.

Your W knows that you have it in you to walk away from her and start a new life if she starts acting up again.