Guptill, Patel back in New Zealand shake up