Messi is still the best player of this generation, simply because he performs better while having similar stats.
But Ronaldo has managed to win it all with us, Real and Portugal, enjoyed both domestic and international success, which is something Messi couldn't match (could only win it with Barca). Messi has much more domestic success though, part of reason is his superior performances overall, and another part of reason is his superior teammates. For CL I thought they are more or less equal. (Ronaldo being all time top scorer and winning 3 CL, Messi has won 1 more but scored less goals.)