Right there with you. It feels like there's the initial part - very short - of the episode is about Buffy's parental issues because it's hard for her to watch her mother with another man, but then he gets extremely creepy at the mini-golf. And it always scares me that sequence not only because of what he says - and what he says about slapping her makes him more clearly as potential abuser - but the bit in which he nervosly beats his leg and that is the moment in which I feel like he's restraining his intense wish to attack her. I think that body language is far more sincere than actual language and you can see what people don't what to say at laud with their instictive actions.