Riley's leaving and Xander's speech to Buffy always hit me like a punch to the gut - and your assessment of Buffy's emotional state is spot-on; somewhere there's an essay on Buffy's Campbellian hero's journey (again, I'm on my phone so I can't find it; maybe try slayageonline?), but your grounding it in her emotional journey makes so much sense to me.