Im not sure.
I think in the end
SPOLIER:
When Cloud says he thinks he can meet her there and Tifa looks all sad, its like he chooses Aeris.
But Tifa is the one that helps him out the most, and guides him and helps him become him again. i almost think its an equal part given to them. It isnt really clear who Cloud chooses.