we just returned from a fabulous 7-night stay. because it was our second time at the resort, and because we were both too busy with work to organise the visit beforehand, we hadn't exchanged on any of these new upgrade options. to our delight, upon arrival we were told that we would be given a beach villa for the first night but then be moved to a spa water villa for the remaining 6, "if we didn't mind." of course we didn't mind! breakfast was included as well, at any of the 3 restaurants (atoll, vilu, or the spa). so apparently they still reserve some exceptional treatment for hh diamond members contrary to previous posters' experiences.
snorkeling proved so incredible during this visit (even better than last time), that we didn't opt for any of the excursions. perhaps the highlight was watching my husband do backflips in the water sandwiched between two friendly giant mantas.
i echo most other comments that this is hands-down the best vacation destination we've ever experienced.
regarding some prior questions about dining, our personal favorites are sunset grill and mandhoo (at the spa). but of course your tastes may vary. sunset grill merits advance reservation, while mandhoo seemed to always have space for dinner.