I agree with the fins. Fins can also get you out of trouble if you get caught in a current.
I can snorkel for hours with fins and mask. One easy kick and you move to the next spot without disturbing the sea life.
The key is the proper fit. Most charter companies have a bin with stuff in it but I carry my own mask, snorkel and fins.