Definitely a good idea to do the visa waiver thing. Mine always came back immediately with approval, but in theory it can take a few days. Now they've put all their entry paperwork on-line, I don't know if it has to be done a few days in advance of travel.