I did watch the end credits. (SPOILER) The fact he came back when and how he did told me that it had to be a dream. He did die, otherwise he'd be in the home video and Rinoa wouldn't be wearing a black cloth on her arm.