Ah, thanks for the correction - I keep wanting to call it Harm's Way for some reason. It's Harominic Divergence.

I think it was a major plot point, but at the same time poking fun at and commenting on some pop culture items that the writers most likely have mixed feelings about.

Sort of both. Two birds with one stone, as the saying goes.

So Whedon has more or less validated my opinion that he's trying to align the Buffyverse with Fray? Good to know. I thought I'd read somewhere that he had, but couldn't remember. Thank you.