Squeezing all of the cast plus the new villains while keeping Cloud in focus would have been impossible in an hour and a half.

As for water curing everybody, it wasn't because Cloud defeated the baddies. It's because Aeris was born an Ancient and that gives her +10 to Sexyness, and even though she's dead she can do whatever she wants at any time.