Oh TC, I am so sorry you had such a yuk time with BF after such a good day, and enjoying so much before he got home.
Fortunately you are not the person you were some time back, and took it all in without just gritting your teeth and letting it fester inside. Now you can look at what you want and expect and do what you need to meet those things for you, and isn't that proof of how far you are along recovery for you.
It is disappointing for this to occur, and the last sort of hassle you planned, but I have no doubt you will handle it as it needs to be.
Keeping you in my thoughts and prayers.
God bless