No, you shouldn't have to. If somebody asks you to surrender, tell them that you'll use AVR to return back to US and will need I-94. Don't worry too much about it. A lot of people have done it in the past.
No disrespect intended but if you are too concerned about it then why don't you go...