Are you buying 2 tickets upgrading one to an AP and one to a WP&M? Or do you want to upgrade the same ticket to a WP&M and then upgrade again to an AP? Only asking because if you add the water parks and use it you must then upgrade to the AP with water park entitlements (i.e. The most expensive one). Just wanted to make sure you knew that

ETA great minds think alike
@supersnoop! You just typed faster