The visa waiver should apply. You should be able to reenter the US with the same waiver after a short trip to Canada and surrender your I-94W when to the airline when leaving the US. I think you can also give the departure form the Canadian immigration when leaving the US.