I'm still waiting to understand the following logic: 2005-2007 Nadal would apparently not beat post 2011 Djokovic on clay despite being undefeated (until his loss to Fed in Hamburg), because he struggled with Mathieu and Davydenko. But, post 2011 Djokovic would absolutely beat 2005-2007 Nadal despite losing plenty of matches, to Nadal and others, and struggling in plenty others, all the while amassing zero French Open titles? I'm confused.
I still think it's inevitable that Novak wins Roland Garros though. And I'd narrowly take his best on clay over Roger's.