As far as the upgrades at Moorea, I stayed there last May/June for 5 nights and was lucky enough to get the upgrade to the OTW bungalow but when I was there I also talked to someone who was there for a longer period of time and was able to switch for some of the nights. so if you arrive and don't get upgraded I would check and see if you can switch for some nights.. also others were able to pay for the upgrade..
oh and far as the food and drinks, I would highly recommend bringing your favorite alcohol and snacks with you.. We loved just hanging out on our dock and making drinks while we had some snacks..
the food at the hotel was expensive (15-18 for sandwiches) and around $13 for a mixed drink.. but at happy hour drinks are 2 for 1.. if you have any questions about the island and places to go.. let me know.. WE LOVED IT THERE!!!