The world No 1 aims to complete a full European clay-court season before his Roland Garros title defence.