I’d wait. The AS resorts are the cheapest on property, so any move is an upgrade in terms of price. It looks like the plan is to move is the Pop or AoA. There could be some moves elsewhere later on, but those will probably be if the other Values book up. With the matrix that came out yesterday, the CMs are mostly just plugging into the applicable substitute, so calling now is unlikely to alter where you end up.
If you had a different resort booked, especially if it was a specialty room type, it would make sense to call now while there’s still inventory to get you the closest match or upgrade. Even if you were at ASMu in a family suite, I’d say to call before all the AoA suites were assigned to others.
But I don’t think hours of being on hold is worthwhile in your case, especially when you have so much time left to be able to call at a less busy time. In addition to making things easier on yourself, waiting until things die down will let those who urgently need to get through for July and August to get through a little more easily.