I think you and your friend are right. I think I had just prepared myself so much for the fact that we were going to have an elaborate and stupid bait and switch that it took me a little too off guard. A little sleep and a second viewing of the episode and I've come down from the little ledge I was on last night.

The last scene...that was just...*shivers* that was good and sad and damn it please make it all better!

I'm not sure where you stand on spoilers, so I'll not say too much, other than to agree. Yes, I hope they make it all better (but not too quick, I like my angst). And oh... was there angst. Everyone's performance was out-of-the-park this episode. Ahh... I'll probably say more on your review. Apparently I'm emoting enough that I've aroused the attention of the room's other occupants.