I wonder how much is the add-on cost for points + upgrade. Can anyone tell me? When we were there, we were told that all the water villas were full, hence it wasn't an option. Otherwise, 22k points + cash seems like a great deal.

Anyone?