Yeah, def. I even like Riley, overall, but I think that he is someone who ultimately tries to, but doesn't, break out of the patriarchal system that nurtured and created him. That doesn't make him a villain; as a soldier, post-ITW, he's presumably not doing any more experiments on demons, and he seems to have an equitable relationship with his wife. But he's not really able to handle Buffy and an environment that lacks the structure he craves, and that structure is not Buffy's structure.

While the fact that Willow's dream is about her fears that she's pretending gets all the press (as it should), the fact that she seems to think nearly everyone else in the world is in costume, playing roles, too, suggests that subconsciously she doesn't think anyone's fully authentic, even Buffy. (Well, her present/former lovers, Xander, Oz and Tara aren't involved in the production, so.) Though as a flapper, Buffy is still way closer to the modern era than "cowboy" and "milkmaid" are.