For our visits, it would be one or the other. I think more people have reached their tolerance of price increases. To wake up at 7 am and fight for attraction availability after purchasing Genie+ and not getting what you want, even though you are staying at a Disney resort gave us a very sour vibe.