Sounds plausible, Jennifer! I'm sympathetic because I've had some OCD tendencies myself, since childhood. What caused friction with his quirks, though, wasn't so much his quirks themselves, but rather that he tried to act as though those quirks were my responsibility to abide by... and got mad if I wanted to make healthy choices to the contrary. (By contrast, I try to be very mindful and deliberate about not inconveniencing people when my quirks surface.)

Here's to hoping "water guy" has done himself the kindness of seeking professional therapy. :)