I94 extension after Passport Renewal - With Expired stamped Visa

USA H1B Visa
1

Please help me, need input for my situation. I am trying to extend I 94 after passport renewal, here is my situation. “My stamped visa expired on Sep 2018”

My I94 is expiring : June 1st
Stamped Visa expired: Sep 2018
Old Passport expiring: June 2nd
Got my new passport a week back
I797 Valid till 2021 (Got latest I797 before my international travel)

So now I should go to CBP office in Texas border (Laredo) and get my I94 extended,
A) With my expired stamped visa will I have any issues at Texas border?
B) Has any one extended the I94 in INT airport CBP office after passport renewal?

Appriciate you insight.
Thanks.

2

A) You should not have issues.
B) We have many, who have done that as well.

We have fully listed out options, read Update I-94 after Passport Renewal Options in US

3

Are you able to renew your I-94 by visiting CBP in texas border?

I also have similar or worst than this…MY I-94 already expired and looking to update with new passport in hand now. Any suggestion would help.

regards