I can see them going to one level of AP only.
Current AP benefits are: free parking, 20% mech discount, 10% discount on some restaurants, park-hopper tickets, discounts on spas, sports and recreation activities, discounts on events and tours, special event ticket discounts, rental car discounts, special AP only events, special AP only room discounts.
There is a lot of value in that list but not everyone will use all of it. Let's say that none of these benefits change.
Do away with 'locals only' AP's, and all the other separate levels of access (Pixie, Sorcerer, and Pirate). Price an AP at at $1,800, no blackouts for anyone. You need around 15 visits to break even (avg $120 per visit). Locals have monthly payments at $150. Locals can still go more, with no blackouts to derive even more value.