Another option might be one year when you might not really need an AP, to buy non-expiring hopper tickets with Water Park and More added.
Undercover Tourist has great deals on these. You get a matching number of water park days to the number of park days you buy. Since the days never expire, you could have water park days for years to come when you have regular APs.