Pretty much echoed my own take on it, though I like your thoughts on Amy's re-use of spells and Buffy's nightmare. Though I think Xander's state in the final scene might have something to do with Renee getting a sword through her back - see my own review in my LJ for my thoughts on that!