Two i797, old original has expiry of June 2017 and new is already expired in June 2016

Two i797, old/original has expiry of June 2017 and new is already expired in June 2016, I got this new I-797 as a part of relocation amendment which has expiry of June 2016,

I am in US and got notified by legal employer team about my h1b expiration where they gave me two option…

Either go back to previous location and work over there for 1 month till they file new H extension as per origonal I797, OR Depart US and file H extension and come back once I have new status…

Also My i94 shows expiry of June 2017 which is as per origonal petition…

Also I have trael plan in home country in next 30 days so not sure what to do? and best solution

Based upon your I-94, you have authorization to stay in US. However, your 797 has expired for the new location and you cannot work at the new location. Did your attorney not file extension before June 2016?

I would suggest filing an amendment + extension in PP soon. You may receive RFE asking how you are working at the new location w/o any authorization, and your attorney will have to deal with it.