My money is on a separate annual pass, say $89.99 but also as a discounted add on to AP holders, 59.99.
My other thought was they could launch a whole new access all areas pass, . This top tier pass would be the only one to include the water park in an annual pass. Though possiblylimiting the amount of water park pass holders it would drive sales of higher value annual passes.