Indeed. I would have preferred a different ending though.
[spoiler]You know how right before Ushio gets sick they were going to go to a relay event or whatever? I was hoping Tomoya would have a moment with Kyou there, and a relationship would start to develop. The rest of the anime could be about Tomoya feeling guilty over having feelings for Kyou after Nagisa's death. That scene on the hill where Tomoya almost doesn't call out to Nagisa could be altered and Nagisa could tell Tomoya it is okay to move on or something like that.[/spoiler]
Though unlike others, I do like the original ending. I just think this one would have been better. Probably because I think Kyou is best girl.
Anyways, I'm rewatching it right now. About midway through the Kotomi arc.