I just came back from Canada. You should keep your I-94 when you enter Canada. When you come back, you need to fill out a new I-94 form when you go through the US Custom in Canada. Bring your H1-B materials and your I-485 receipt. But seems that my I-485 receipt even confused him.