My plan is to 1-go to window to exchange my vouchers w/passports in hand. 2-Upgrade to 2day base w/waterpark and more option.I will then have admission to 2 parks plus 1 day at waterpark and 1 visit to DisneyQuest. Does this plan sound on target? I'm going next month.