Flying from Brisbane to Shanghai via Guangzhou? Free visa

Have booked flight from Brisbane to Shanghai but have to change aircraft at Guangzhou with almost 5 hours wait for the second flight (Guangzhou to Shanghai). On arrival Shanghai can I still get the 72 or 144 hour free visa - we are boarding a cruise liner in Shanghai for a cruise back to Brisbane. From what I have read, if I transit to Shanghai via another mainland airport (ie Guangzhou) I am not sure if I can still get the free visa on arrival Shanghai or do I have to get a Visa in Australia before departing,