Sounds like you working on a relationship agreement is SO needed here.
I'm glad you are doing it for yourself even if this particular relationship does not move forward. There's all kinds of communication haywire going on there.
I hope the Talk tomorrow moves things forward to some kind of resolution. And gets YOU at least, to a better headspace.
Pampering bath totally sounds like good selfcare right now