You should be fine.
It is right you need to surrender I-94 when leaving US and get a new I-94 when re-entering US. Also check and see if your I-94 marks "multiple entries".
Bear in mind in future: Always keep your original docs with you. make copy of them if you have to submit the original docs.