Cabo/La Paz shops on a cruise

My wife and I are both going to be on a cruise first week of October that stops in mazatlan, Cabo, and la paz. The cruise is in memorial of my late aunt, so I’m not trying to spend every port day diving but would love to dive in 2 of the ports. There are no dives through the cruise line so it will have to be through a third party. Anyone have any recommendations?