New Zealander Traveling to Japan.

Hi there , I will be traveling to Tokyo in November. I will be departing New Zealand and staying 2 nights (3 days) in Guangzhou and then fly to Tokyo.

When returning to New Zealand I will be stopping in Guangzhou for 23 hours.

Will I need to apply for any visas ? or do I qualify for the 72 hour & 24 hour free transit?

I do plan to leave the airport both times to sight see around Guangzhou.

Thanks