The key is how long you will stay in China

If it is short, like a few days or two-three weeks, you just use your AP and come back as AOS. Your new H1-B will overwrite AOS automatically.

If it is long, two months or more, aggree with 863211's idea.