Latest development - China Southern changed my flight timings so now I have only a 5 1/2 hour layover in Guangzhou... arrival 5:40am and departs at 11:10am.
Should I just stay in the airport? I have been to Guangzhou airport and I really did not like it very much. Severely overpriced and nothing much to do.