Thank you both for your replies. Even my company lawyer told me the same. He said both methods will work, provided, when entering back into the US, I ask for and get a new I-94 which has validity till I797 end date. I haven't made up my mind about making the trip yet.