Tifa. She was Cloud's lifelong friend, they actually KNEW each other, she cared about him a lot. He hardly knew Aeris. I can't think of any good reason why he'd be better with her.