Follow-up...
Te Whau Winery Cafe (pronounced "Teh-Fow") was excellent. Service was very friendly and generally good, though a bit disorganized. The food was really good NZ cuisine. The wine list was spectacular, though I confessed to the proprietor that I just couldn't come to a winery in NZ and order a huge Bordeaux, even if I definitely would order it in another setting. I really wanted to taste NZ wines, and specifically the wines from the very winery we were standing in. So... Te Whau really makes just one wine, and it was quite tasty, similar to many Australian shiraz and shiraz-based blends in structure, balance, earthiness, and the non-jammyness found in many American syrahs. The slightly older vintage was better, so if you can grab a library selection or can lay down a current release for a while, you might get something really great. Best of all was the setting-- a beautiful view of a little cove on Waiheke and, in the other direction, clear across the harbour back to Auckland city.
I'll write a review of The Grove in the other thread.