Steve,
All sound advice.
Regarding NZ. Depending how much time you have consider the following courses, Kauri Cliffs, Titirangi, Kinloch, Wairakei, Cape Kidnappers, Paraparaumu and the newly renovated Royal Wellington ( not played yet myself ). Then as others have said a stay in Queenstown, with or without golf.