Update on yesterday: feeling better about the O situation, after talking to Z and realizing the main issue is probably just that we spent far too much time together this weekend. Z made the salient point that, once you're used to being single, you take for granted how much of your time is your own. That's one of those things I realized, then forgot.