When I was on H1, I never surrended the I-94 attached
to the I-797 approval letter when leaving the country, but only the white cards got from the last trips. So at any time during my H-1 staus, I always had 2 I-94s in hands.
You can wait for your H1 outside of US.