Upgrading to annual pass

Purchased 7Day Hopper & More Pass for July but may book another trip for March. Upgrade to annual pass makes sense for free parking and discounts. Once I upgrade to regular AP I lose the water park/mini golf unless I buy the Platinum Plus pass - is that correct?

Correct. Only the Platinum Plus AP includes the waterparks.