Another snorkelling question...

Two years ago I was in Fiji and I was impressed with the snorkelling off the beaches of Nacula, Waya and Manta Ray Islands in the Yasawas and from the little island of Caqalai.

As I'm going to Fiji again for 4 weeks this July, I'm wondering if there are more equally good snorkelling spots. I'll definitely go back to Nacula and Waya, but I'd love to hear other recommendations as well.

Thanks in advance!