Yup. Go either to Cayo Levisa or Maria la Gorda. If you go to Cayo Levisa, call ahead and make sure the dive boat is running and you can get some diving in. It isn't always, although they have an excellent dive shop and dive masters, they cater to the European crowd, who just aren't the keen divers Americans are. I have not been to maria la Gorda myself, but the Cuban researchers I used to carry said it beats Jardines all stupid. The only reason big life is seen at Jardines is because they feed it to bring it in (according to the dive safety officer at the Havana Aquarium). What you see at Maria la Gorda is real and not fed to keep it around.
