Tifa, easily. Aerith may have "wanted to see the real Cloud", but she didn't. Tifa liked Cloud, Aerith liked Zack. Cloud clearly had feels for both, but I never felt at any point that Aerith + Cloud was a relationship, it was more like watching two ten year olds "dating".