Any one of the I-94s will be OK.
If you worry too much, my suggestion to you is that you just go to the CBP local Deffered Inspection Office to see whether you can fix the I-94 issue. Then, file your I-485 and apply for the AP before your unlawful presence reaches 180 days. If you can not fix the I-94 in US, then you just go to China to apply for the H1/H4 visa adn bring the AP with you. If you have trouble to get the H1/H4 visa, then use AP to come back and wait for the I-485. If your I-485 is denied due to your unlawful presence, you can file Motion to reopen or go to the immigration court to fight for it and I believe you will won based on 245(k).
If you can get the H1/H4 visa, just enter US with H1/H4 visa. If your I-485 denied, you may just file a new I-485, or file Motion to reopen or go to the immigration court.
