You can also swim and snorkel at Negril Escape (formerly Mariner's)
Marley, I agree about the Pickled Parrot! That was our favorite place to go for a swim or snorkel. My daughters and I would swim all the way into Joseph's cave.