Sounds like you need to work on listening and validating. Are you?
Why are you discussing D and moving out? If she brings it up, listen and validate.
The one thing that really bothers me in your post is that you say:
Quote:
This time I feel well prepared.
DB isn't something you implement to save your M and then go back to the same old same old. It sounds like that's what you did and now you are back in the same boat. M is work...just because there's not a hole in the ship doesn't mean you stop taking care of it.
What were the problems in your first M? How did you address them? Were your changes real? What do you see as the problems in your current M? Are they the same or similar?