Wow - very interesting to read the Diamond upgrades that are being given here ... stayed here 3x in the past as a Diamond, and always received a very nice high-floor room with a great ocean view, but never a villa or a suite. TBH though, the base rooms are very nice, spacious & private, and I feel like a 2-3 bedroom villa would be a waste for 2 ppl, but I definitely wouldn't say no ! Pretty cool though to see them taking great care of Diamonds, despite it being peak season in Cabo.