WL or AoA? Long waits for boat ride to MK?

[cmsnyder77]

I am going with DD3 (almost 4) and DD13 April 1-8. I know that it will be a very busy time no matter where we stay. I booked AoA LM rooms for both the theming and the price. Now I am worried about the bus transportation. The last time we stayed value, at POP, we had to stand on the bus a large portion of the time and had long waits for buses. I am considering a switch to WL, with a $2000 increase in price. I have a feeling we will spend the majority of our park time at MK, so I'm thinking this would make WL a good choice. I am sure that at park opening and after fireworks, the boats might have long waits, but is this typical?

If I make the switch and pay more $$, I really want it to be worth it.