I am about to leave China....hopefully.
Trying to do: Beijing-Shanghai with train; Shanghai-PVG with Didi/Taxi; PVG-AKL on NZ.
Not sure if that is even possible??

For the return back to China, it will largely depend on what the +7 and what the 7 in Beijing will look like.
On my trip to China in November 21, it was:
- 3 nights (SFO) ----> mini holiday, and some sightseeing
- 14 nights Shanghai isolated hotel ----> pretty horrible
- 7 nights Shanghai city hotel ----> nice holiday & sightseeing, a lot of bicycling around
- 7 nights Beijing apartment ----> getting ready for work doing some prep stuff, not too bad as I could still go out, and drive and ride around

I was totally fine with this, although a LOT of wasted time of course. Tried to make the most of it, and overall it was an okay experience, HOWEVER, I am not sure I'd feel the same way doing this a second time, a third...etc. etc.