Colin McRae will return to the Wales Rally GB next month and be joined by his former co-driver Nicky Grist as part of the Skoda team.