Havent tripped to China - but have been many other places (EU, India) and your comments and suggestions are quite sound.

Only addition I would suggest is to find an older/support USB LAN dongle in the event you can connect to a wire with no wifi around.

This saved me at a Marriott LHR, where wifi was down the night I passed through...