I-94 expiry on passport expiry

Hi, my I-94 is expiring on my passport expiry date. Though I have my H1 visa valid for 2 more years, the least expiry I.e I-94 is legal state to stay in US.

I need to travel to India now, so should I need to apply for extension within US or will I get new I-94 upon reentry to US as per new passport. Which option is best

You can leave the US before the I-94 expiry and enter using your existing I-797 and a valid visa and renewed passport. CBP will issue a new I-94 matching the expiry of current I-797.

You can apply for extension of status in future within 6 months of your current I-797 expiry.