I have had the opportunity to dive Cabo a few times and enjoyed each. You don’t need a big dive boat and in fact you’ll can get to all the local sites on a small boat. The shop I use is Lands End Divers and they have taken good care of my wife and I.