I love this list. "An ex returns" is already done, though - 1x08 (The Girl in the Fridge). And I'm fairly certain that The Pain in the Heart (3x15) qualifies as "someone who was dead is not actually dead." I am super excited for bodyswap, and do not doubt it will somehow happen.