Well, choosing #1 is good in a way because it's best for your D7, but in a way it can't affect the way you are while being around D7. Your not a doormat, I am a doormat because I have been supporting my W EA, for six months while I moved in to my parents house. Now I am going back and will be in your sitch very soon. All I can tell you is to hang tight and keep DBing. I won't tell me W to move out but I will make it known that the choice is hers, and only hers. Good thing is, she is hesitant. Sounds like there is hope. Just keep finding out what it is she is looking for, and keep trying to give it to her.
M-31 W-25 S-1 1/2 bomb dropped 9-01-06,and repeating over and over "I, not events, have the power to make me happy or unhappy today. I can choose which it shall be." Groucho Marx.