I've been there. You made the right move. You are still in the house but have given space to her and you. Enjoy the guest room!
Also... you need to start hanging out, we had a great time last night at the shop.