You don't have anything north of Auckland. Are you interested in Bay of Islands or Point Reinga.
Weve been to most of the places yiu are considering. What do you plan to do in Napier for 2 nights?
While touristy Rotorua geological sites are interesting and each of them are different experiences ..Wai o Tapu the most commercial, the boat ride in Waimangu is nice and Orekei Karako is a special experience.