What you said may be true and soemtimes USCIS is not strict. So, may just file the H1 petition and use premium processing to get the result in 15 days. If the approval notice has I-94, just work. If it has no I-94, then just go to China to get the H1 visa to come back.