I've stayed here a ton, and you aren't getting upgraded to a villa for free. And if you want to pay for it, they will ask for the difference in the rates, which is typically $1,000+/night.

Even in May upgrades are sometimes tough on longer stays, so set your expectations accordingly.