With having 7 days, I think the 2 planned events are enough.
You will find that all the best laid plans get washed out to sea in Negril.
If you enjoy snorkelling, you could always call up Famous Vincent and have him pick you up for a great snorkelling adventure. Morning is best, when the sea is as smooth as glass. Finish it off with a cruise down the coastline of the cliffs.
Enjoy!
