We did the photo excursion on Moorea, which I highly recommend. We got to go to some places that were not available to the public and it was one of the best days we had (well, except for my pearl shopping, which is a whole other thread).
I had the 20D then and I took a 20-35 Wide Angle lense and a 50 2.5 Macro lens. For the water, I took a disposable underwater camera, which was fine for the water snaps. I think Frank took a 18-55 kit lens. We've greatly upgraded our stuff since we went to Tahiti. The G7 will do well too!