My ideal calendar for him next year:
Strade Bianche
Tirreno or Catalunya
Liège
Giro (as season target)
San Seb
Montreal
Worlds
Lombardia
add in a few non world tour one days and maybe another one week in the second half of the season. Think he could podium the Giro next year with his Dauphine...