Thanks for the accommodation recommendation, Scoop. Sorry to hear that your Antipodean idyll is coming to an end.
Taking this off topic, but knowing that you are a fan of both French Polynesia and self-contained accommodation, do you have any recommendations of that type for Moorea, Bora Bora or any of the other 'inner' islands in FP? We're heading there for 10 days at easter on an AC award, but the accomm costs are threatening to turn it into a very expensive holiday nonetheless!