My solution: all WRC2 first, then WRC with order decided after qualifying like last year.