Of course he loved both. But he never had a chance to let his love for Aerith really grow and in the lifestream he realized he was meant to be with Tifa. That's all there is to it really.