I am now following the sun, travelling from China to Mexico!
Revised itinerary potentially fixes ‘4 hours in Beijing problem’.