Dont miss Pillar Coral and M & M.
I personally like the diving around Habaneros as well. There seemed to be an abundance of juvenile fish there which is what I love to see. Lot's of variety as well.
Love Tunnels is another great spot too. Nice swim throughs and tunnels.