I have same kind of Problem.
My visa and I-94 is expired .Now I got new I-94 wiht the new H1-approval notice.
I am leaving tomorrow to India for stamping.
Should I submit 2 I-94s (One with the Old port of entry) and one with the New H1-approval notice.
As I am leaving tomorrow, let me know immediately.