John, I think you need to just let W move upstairs and continue to give her space. I wouldn't question this move with her, just be agreeable. If you argue she is going to see this as control. Just be really nice to her when she is around(Concerned but not mushy)and eventually I think things will work themselves out on their own.
I think Ron is right. You probably need to let D and W work things out between them from now on out. I would step in if anything really hostile transpires, but otherwise I would let well enough alone.
Your D is at an age when they are very protective of their Daddies.
I think things will work themselves out. Now would be a good time for you to take up a hobby or find something else to do, to get your mind off things. You've been DBing pretty intensely for quite a while.