Heading back on the 30th sounds good. Ngaurahoe sounds pretty appealing.
Most important is climbing lots down there!