That sucks, sorry to hear you had to stop diving! I'm not using my "X" underwater, but do like to take topside shots before and after dives and on the boat rides to/from dive sites.
Regarding whale sharks, we didn't see any this trip but I have swam with them off La Paz, in Baja California...