Two city question

If I have a 20 hour layover in Shanghai, and then another 20 hour in Kunming (this would be on the same flight from the USA to Thailand), then as I understand, I cannot use the 24 hour direct transit (since the total time is more than 24 hours). Instead, would I have to use the 24 hour direct transit for Shanghai, and then the 72 hour Visa-free transit for Kunming?. Thanks...