Appreciate this thread is quite old now but was hoping you're still reading this! Was everything ok in the end? We're in a similar situation and would be very interested to know how things worked out.
What happened at immigration? Were there any problems exiting China without a visa in the Chinese Travel Document?
Thanks a lot for your help!