Roll on the clay. 
Improvement is needed though against Novak. He is a really bad matchup for Nadal in almost the same vein as Nadal is to Federer.
Nole always has been. Toni has always said that Nole was the player that he most worried about. Nadal was beating him earlier because of his will and desire to win, but when it comes down to the nuts and bolts, Nole can do everything just as well as Nadal, especially since he's fixed his endurance and mental aspect.