Absolutely Air NZ, with or without the refit IMHO.

UA fail on every level, but especially service... I have never been made so very angry by so many people at the same airline on the same day. Personally, I would NEVER travel with them ever again.

This is not to say that Air NZ is first by default. Having just done an F RTW on NH/SQ/NZ/UA, Air NZ won hands down, even compared to SQ.