Tifa all the way.
I didn't get nearly as attached to Aeris as a lot of people did, it wasn't even that big a deal when she died.

PLUS, she's dead, so she's gone anyways.