Surface segments do not count towards your flight counts and limits. They do however count both cities as having a stopover (although only 1 stopover to the stopover tally).

Re returning to point of origin. Not quite - you aren't allowed to leave country of origin more than once. You are however allowed to travel around Australia once you return at the end (subject to 4 SWP flights, 2 stopovers in continent of origin, and restrictions on PER/DRW/BME flights). Starting in AKL would solve the problem anyway.