You have good intentions. I think it's very important to recognize that we can only see the situation as it was and accept it for what it is today. We don't know what will come. Embrace that uncertainty. You may separate, you may not. It seems you are basing your internal actions on the way your sitch progresses. Be proactive, take action now. Make changes in yourself that you have been putting off or may be putting off contingent on separation. Detaching is good regardless of the situation. It's good that you have good intentions for one possible outcome. Make sure the quality of your intentions for the future is reflected in your actions today.
“No problem can be solved from the same level of consciousness that created it. ” – Albert Einstein