Federer should retire. Nadal will outclass everyone, because he won 22 matches in row on clay, defeating 2(TWO) Top 8 players.
2 of Top10, Mr.
And you forgot to write that the rest - 20 matches - were won against relatively poor enemies (usually 20+ in the ranking).
In my opinion, there is huge luck behind current Nadal's no. 1. As example he lost matches against 8 of Top10 players. His game is also relatively weak, he makes many errors, does not look like an invincible machine.
It's also probable that his health won't be perfect in the next months.
On the other side, Federer did look quite good at RG, so he will win something later, probably. Unfortunately for Federer, it's much easier to gain many points during the clay season. In the last year Nadal won 1 GS and just 3 tournaments - all in the last 2 months! ...and it was sufficient to regain no. 1. That's really amazing that 2 months of 12 decide... :O