Personally when my W was still at home I showed her the kind, loving H that she felt was lacking before BD. I kept it up until after she moved, and in fact I helped her move things and get things set up in her new house. I got a lot of "WTH are you doing???" comments both here and from my friends, LOL! But I didn't want us parting on a sour note. I don't have any regrets over it. But I did start detaching in a big way after she moved out.
Since she's only there another week I wouldn't go crazy trying to distance or go dark for now. You'll have plenty of time for that after she moves. I scanned your thread again but couldn't find too much about what the problems were in your M, just keep in mind that Michele says if you were cold and distant in the M that going dark can be seen by the WAS as "more of the same" behavior, so be careful with it.