I would highly recommend snorkeling. I fully enjoyed my experience, although it was too short. Now that I have some experience, I would rent the gear and go on my own to have more time in the water. For safety reasons (not getting run over by a boat, etc), I would recommend taking the tour.
Seeing pictures/TV ads will never be the same now that I have seen it for myself. Can't wait to try scuba!