I am glad W did NOT go to Mexico. I think at this point, you are right to tell her how you feel/what you think. You moved out, now you moved back, of course you wouldn't expect to be sleeping in Ds bed. You may as well be at the apartment if you aren't going to be "together". I am probably not helping here, I know I am not sounding DB-ish!
At this point, I agree with K in that you shouldn't let your mind lead you where your W has not taken you. (In terms of OM or her feelings changing again.) You did your part. You told her how you felt about the situation. She said she wanted to talk about it tomorrow. I think at this point the best approach--not that you asked--would be to listen to whatever she has to say before making any kind of decisions.
I know that if she says she wants you and gets all close and warm again, even that will leave you wondering. Because you guys did that before the trip to the Dominican Republic, and you may have concerns that you will always have to be reminding your W of what you want, instead of her just doing it/being it/whatever. I don't think I am saying that right. What I mean is, I think I remember you saying that before, that you don't want this to continue to repeat itself, where you get closer, you drift apart, you leave, then you get closer, etc. etc.
But at this point, I would just have both ears and your mind as open as possible to what she has to say. Love on D7 and take care of John. Thinking of you...