I94 expired due to passport expiry

Hi,
Please help with following situation:
I entered the United States on H4 visa with less than 6 months validity on my passport. Hence the CBP officer had shortened my stay till date of passport expiry.
We renewed the passport but were not aware about the shortened stay. We recently found out that my I94 was expired and reached out to our lawyer.
Now, I94 on the website shows expired but I94 on the I797 and H4 visa is valid till Jan 2025.
We went to Mexico border as suggested by our lawyer. But the CBP officer there only gave an entry stamp on the new I94. After which we emailed the deferred Inspection office to get the I94 updated to match the I797 validity but they responded stating your stay at the contiguous border country has to be more than 30 days in order to get a new I94.

  1. Please suggest what are our options to resolve this situation?
  2. Is doing NPT better or should I go to India and return?
  3. Will there be any issue while returning as there is (less than 180 days) stay beyong I94 expiry?
  4. Do I have to apply and go for new H4 stamping once in India?
    Please provide any solution that might have worked for you…

I would just file an extension of status with NPT. Below are some options if you received a shortened I-94 but is still valid and not expired.