We were there the first week of June, and at that point they already were only putting people in the refurbished rooms (we paid for the old, and got the new). They were working on the last of the old styled rooms, so there is zero chance you will get the old style. The only thing iffy for you will be whether the pool in the space that once was the Neverland pool will be finished by then. I believe it is supposed to be completed in November, but you just never know with construction.