Your math seems good.
Keep in mind there likely will be multi-day
Epic tickets available in 2026, and there may be Epic inclusive APs in 2026 (And will Epic inclusive APs be the only option once they're released? Who knows).
You might book a APH rate and a non-APH rate now, and then just cancel whichever once you've made your final decision / once the options for next year are known.