We are arriving this Saturday to Disney. I now have vouchers for "regular" AP's. We were planning to purchase the annunal pass for Disney Quest/Water Park when we arrived. I now hear that Disney Quest is included with the PAP's. If this is so, it would be about the same price just to buy the PAP instead of the AP's + waterpark/DQ AP's. Can I upgrade the AP's vouchers when I arrive at Disney to PAP's? Thanks.