Transit or Tourist visa in Shanghai and Kunming

We both are Srilankan passport holders visiting USA on multiple one and on my way to USA and return I find long transits in Shanghai (PVG) and Kunming (KMG) on China eastern airline and itinerary as follows.

1. MU 714 V 12NOV CMBKMG HK2 0010 0720 O* TH
2. MU 2422 B 12NOV KMGPVG HK2 1530 1940 O* TH ( over 17 hours in PVG )
3. MU 589 V 13NOV PVGSFO HK2 1300 0930 O* FR
RETURN
4. MU 590 V 30NOV SFOPVG HK2 1200 #1730 O* MO
5. MU 748 B 01DEC PVGKMG HK2 2100 #0040 O* TU (over 15 hours in KMG)
6. MU 713 V 02DEC KMGCMB HK2 1610 1855 O* WE
Since i prefer to go out in Shanghai if possible in Kunming, do i need to apply?

or if i stretch the transit in Shanghai only as follows. Your kind advise is highly appreciated.

2. MU 2422 B 12NOV KMGPVG HK2 1530 1940 O* TH
3. MU 589 V 14NOV PVGSFO HK2 1300 0930 O* SU