Great catch on the source of Xander's insight into what's going on.

I really like your point about Xander and Willow switching roles in season 8. What's interesting is that she needs both the cheerleader and the critic. So it'd make sense that if one moves away from their role the other would tend to shift towards it.