I'm glad that you have looked into the finacial side of things carefully especially with you not being married. Last thing you need is for all that side to go belly up on you.
With regards to your Yoga. I side with you for not giving in this early. I can see the thought process about making efforts early on, but who is to say that it wasn't HIS plans that went wrong and prompted him to see you at short notice? (must try not to be TOO cynical here )
It takes two to rebuild just as it did in the first place. This time however, there are new rules and indepedence should be high on your list of priorities. You like the new Pearl and so it seems does Xbf. If you start losing her and altering your ways too soon, that attraction may wane.