Thanks for the post and congratulations! Good luck in Canada!
But, I am surprised why the US-side immigration officer should question your retention of I-94. Generally, I believe, for short-term travel to Canada/Mexico I-94 need not be returned. We are also planning to land in Vancouver, BC...