Do I need a transit visa or a full tourist visa to visit for 11 hours?

I am a New Zealand passport holder with a Qatar residence visa. In August I will fly to New Zealand and I am thinking of buying a ticket that will give me *two* 11 hour stopovers in Guangzhou (one on the way to New Zealand and one on the way back to Qatar). Do I need to apply for a transit visa or a full tourist visa (with multiple entries)? If I am there for half a day then I would like to get out of the airport and see the city :)