Sounds like you covered the ports! In Cabo, you can take a private operator boat ride out to the Arches. Cheaper than the ship's tours. But disembark as early as possible for that one. Also recommend sampling the food. Great Mexican food all around you! And bring your binoculars and be out on deck whenever possible when at sea as there are dolphins and whales to be spotted everywhere! Enjoy.