Leave Kunming Airport?

We are flying from Canada and have a 15 hour layover at the Shanghai airport and another 15 hour layover at the Changshui airport on our way to Nepal. Since we have two separate stops in China, are we eligible for the 24-hour TWOV or the 72-hour TWOV?

We would like to leave each of these airports to visit restaurants and spas and then return to the airport for the next flight.

Thanks.