I-94 extension after passport renewal

My H1b is valid till June 2021. However , my i-94 is expiring in Nov 2020 due to passport expiry.
I have applied for new passport and will need to update i-94.
Can anyone help me with the process? Please note that i live in Oregon ,USA . I have already talked to local CBP as well as to officer who signed my I-94 at the airport. Both told , that i will need to cross the US border. I am not willing to apply for canada tourist visa .I can visit mexico . Please help me with nearest CBP office and the process to complete.Thanks in advance.