I think if you ended up in a non-rehabbed room your luck would be the worst ever.
They are supposed to be done really soon, so I imagine they will be working on the last of the rooms during your trip, so your chances of getting an unrehabbed room are VERY low.