We are going the same dates as you are! I decided to do a split stay this time and booked the poly for 4 nights and I'm still deciding on where to stay the other 3 nights, maybe Yacht Club...tough decisions to make. Lol!

Hopefully a discount will become available. I would love
free dining, but it looks like room only discounts were offered in the past for the month of June.
We haven't been since 2012, so I guess I better start digging for info on how the new FP+ works,
it looks very intimidating!