Fly: you are doing great; what you are doing seems to be working. (Maybe you got a lucky break with the friend moving away :))
My personal goal is to establish some level of romance back into the relationship before living with my w again and it seems like you would want that too. I have always felt like I would insist on counseling or a marriage workshop or something like that prior to living together again.
You're a bit ahead of me in the process, so i am watching your switch to see what might work for me.
Good luck!!!
Me-45 W-44 T-7 years M-3 years (4th anniversary July 13, but we're separated) Kids from previous relationships (s14 d16 mine, s23, s24 hers)