I just came back from Canada and I was in the exactly the same boat as you are. I travrelled by air.
Do not submit your I-94 when you leave at the airport, however you will have to fill another I-94 when you come back. You maybe subjected to a secondary inspection, a standard procedure and they will staple your new I-94 on your passport.