New Zealand SailGP Team announces world-class substitutes while Olympians make final preparations for Tokyo