All I can add is that, for flights NZ to UK, I now choose Emirates over Air NZ, simply because I appreciate the extra seat width on the Emirates A380. It makes a huge difference on a 12-hour flight.
NZ have almost lost me as a long-haul customer and I just use them for domestic flights.