Prior to the World Cup I felt that Messi was the better player (same scoring rate as CR7 but twice the number of assists) but Ronaldo had the better career (CL, top-scorer & POTY in multiple leagues).
Now I feel that Messi has surpassed Ronaldo even career-wise as the WC is the ultimate football trophy every kid dreams of winning, and he won it while also winning the Golden Ball.
In terms of overall greatness:
Tier 1: Pele, Messi
Tier 2: Maradona
Tier 3: CR7, Di Stefano, Beckenbauer, Cruyff, Neuer, Eusebio
Tier 4: Zidane, Figo, Ronaldo Nazario, Maldini, Platini, Xavi, Buffon, Gerd Muller, Matthaus, Rijkaard, etc.