I have the same situation. But

I remember the officer said you could go to the local immigration office to get a new I-94 that would expire on the same expiring date as that on I-797 after I got my passport extended. He also marked a note the below of the stamp. But, I plan to go back China after I renew my PP before before this I-94 expires. Then, I will get a new I-94 when coming back to US next time. Is it OK? I am not sure whether or not I need to get H1 extended.