On Day two you could catch the early morning Ferry to Rangitoto and then catch the lunchtime one back - it is a great walk/run with great views. You would also have time to do Kelly Tarlton's, which IMHO is just another aquarium, the only highlight for me were the pengiuns.
You will love the walks, some unbeleiveable countryside down there (even better than the photos!)
Enjoy your trip