Orca Diving

Hello scubbits. Anybody know where can one dive with Orcas (preferably in warmer climates) other than the trips they do in Norway?

Even scientific expeditions, not necessarily tourism. Dr. Ingrid Vesser of the Orca Research Trust does whale trips, but I'm not sure about their orca encounters.