He definitely is improving, but on clay, I still think he's not experienced enough... I really think Nadal is the huge favourite for RG! His topspin and endurance makes him really tough on clay.Djokovic is better and better tennis player from month to month !
If he wins AO he will get needed experiance to maybe win FO.
He adopts very quickley to any surface !