I understand I-94 is a must after my new H-1B is approved.
-Your I- 1pptoval will have the I-94 because you filed the new H1 in time. If it does not have I-94, just go outside US (e.g. China) to get the H1 visa to come back or get the I-94 at the US-Canada border if you are Canadian citizen. It will not affect your I-485 if you get the H1 visa/I-94 outside US.