Have you looked in to the AP promo? It doesn't work for us for the time frame (we're using the
AAA room rate special for now). But last night after reading about AP holder discounts, I did some research. For those with AP passes, staying through 6/3, there are some really excellent promotions out there. The best part about what I read is that only one person in the room needs an AP pass to qualify for the room rate discount. That discount was up to 45% at Deluxes, 40% at Mods, etc. So nothing to sneeze at. You basically pay an increased rate on one ticket, but end up with a huge savings on your room, depending on what room level you're staying in. If a promotion like that came along for us, during our time of stay, I figured it would mean a room only savings of $1400 alone. I would have to factor the $150 price difference on the AP ticket, but still - even then... HUGE savings. Then we would also have more flexibility to reexamine if DxDDP would still be beneficial to us (since we're staying club level) or maybe we would want to buy the special 20% dining discount card available to AP holders. So - there are options to save. You just have to evaluate every angle.
My husband mentioned that there should be College courses in Disney Planning.
ETA: keep in mind you have time to make those changes in your ressie after you book. Just do it before your final payment is due to make sure nothing gets messed up, but that gives you time to see what specials will come around for your time frame. We've decided to wait and watch - the AP pass will be just one of our options to keep an eye on