Yeah, I think it only recently hit me just how awful it is that Riley got raped, and the following episode so completely takes the attitude of "Riley is a bad boyfriend and a sex-driven boor for not considering the possibility that Buffy's strange behaviour was because of a body-swap, and he needs to apologise to Buffy for it" and has no interest whatsoever in what it means to him emotionally.