Don't turn in your I-94. except you have to apply for visa in Canada.If any one let you turn it in, just explain the rule to them (Just said my lawyer told me it is ok to travel in 30 days without application for visa and turning in I-94.) must be some professional experts in the airport or the Customs there and clearly know it.
Just enjoy your trip!!!