Also good points. It could be that my reaction to Riley's betrayal and Xander's speech and whatnot while watching that episode colored my impression of it; and again, I haven't gone back to rewatch which usually gives me a different perspective, less emotional than my initial one.