Well it looks as if we'll be back at the Poly in late April/early May under the Disney Visa discount that came out today

(general public discount is supposed to cone out on Monday).
We were originally booked at the Poly then switched to CR due to construction concerns. But the discount was not available for any non-CL rooms at CR over our dates. So I decided that, even with potential construction issues, I'd rather stay at Poly with a 30 percent discount than CR with no discount.
Now we just have to hope that the construction won't be too disruptive. While it looks like there will be some construction going on at the GCH and the east side of the resort, my main concerns are the Volcano Pool being operational and Kona and 'Ohana being open (have ADRs at both).