Transit less than 72 hours

I am from Canada going to Japan and have a layover at Shanghai Pu Dong Airport. The layover is less than 24 hours. Looks like I can apply for the Direct Transit (less than 24 hours), am I correct? Or do I need to apply for the 72 hour permit?

More info ..
My layover is less than 24 hours, and I would like to exit the airport to do some sight-seeing. Do I need to claim my luggage? I will have my boarding pass to my next flight.

Thanks.