We got to Cabo at least once a year, and we always enjoy the sunset cruise on the Rissalena. I don't know if they do specific whale watching tours, but the food is excellent, not a huge party atmosphere, and not too many people. You can also charter the catamaran for just your party if you choose.