A bit late to respond, but better late than never, I suppose.
Completely agreed!
Regarding China, the two scenarios should be considered separatley:
1. the Indo-Hephthalite scenario: Frankly, I still expect much of China to proceed very similarly to OTL, at least until the (alt)Mongol...