Rebooked direct flight to Shanghai from San Francisco

Hello - I'm the one that had a Hainan flight from SJC-PEK-SHA and I was not able to secure a regular VISA in time after finding out I did not qualify for the 144-hour free transit.

I have instead rebooked a new United flight direct from SFO-PVG arriving on 4/1 and I still have my flight from PVG-Phuket, Thailand on 4/6 through Spring Airlines, returning to PVG on 4/11. Then leaving from PVG-SFO on 4/13. I'm really hoping I'm good to go now as my flight is tomorrow - can you please help confirm if I am ok with the 144 hour free transit now?

Thanks again for all the info!