Free 24 hour visa on Outbound / Free 72 hour visa on Inbound for UK Passport holder

I am travelling with Virgin LON - PVG on my outbound flight landing in to Shanghai at 08:30am and booking a separate flight with Spring Air PVG - BKK (Bangkok) that leaves at 12:45 same day for my outbound (will have the confirmed ticket ready) - is this ok for 24 hr twov? I won't be leaving the airport during this time.

On my return I am flying with Spring Air from Bangkok arriving in to Shanghai at 18:15, staying at a hotel in Shanghai close to the airport, and then leaving the following day at 11:50 am - will be leaving the hotel to go to the airport so does this still qualify for the free 24 hr twov or would I queue up in the free 72 hour twov line instead?

Thanks

Steve