Confusion with 24 hour visa-free transit

Hi, I have a problem understanding the 24h visa-free transit policy for China. I am booked on China Eastern from Osaka to Thailand as follows:

Sept 2nd: KIX to Kunming on CE 748. This flight departs KIX at 16:50 and arrives in Kunming at 00:25 the next day. However, it has a stopover in Shanghai PVG arriving at 18:20 and leaving at 20:55. Both legs are under the same flight number (CE748) although I pressume the immigration control will be done at PVG. On Sept. 3rd (same day as arrival in Kunming) at 20:00, I am booked on CE2595 from Kunming to Chiang Mai. I didn't do separate bookings, I just introduced Kansai to Chiang Mai when purchasing the ticket. If the 24h start counting from landing in Shanghai, the total trasit time would be slightly over the 24h free transit allowance (arriving PVG at 18:20 on Sept 2nd and leaving Kunming at 20:00 on Sept 3rd). So, I have appllied for a G type at the Chinese Consulate in Osaka. However, on the same afternoon of my application, the Consulate called me to pick up the passport because appearently, I don't need one (I am an EU citizen). The person in the Consulate said that my travel arrangements fit within the free transit policy.

So, my worries are whether this information is correct or not, providing that my total transit, if counted from arrival in PVG, will be around 26h. Or, is it that, because my flight Osaka-PVG-Kunming are under the same flight number, my transit time counts since the arrival in Kunming? I don't want to have problems right after arriving, so any kind of advice is highly welcome!

Thanks