Contact Molly and John Fox at Aquadeportes
http://www.allaboutcabo.com/cabosanlucaswatersports.htm

These guys do a great job.

If you have done anything other than quarries and springs, my thought is
that you will not consider the diving good, let alone great. I would rather
spend my time in Cabo fishing. A friendly suggestion is to do that. Right
now for billfish it is probably Stripers..but the Yellowfin and Dorado
should be running strong.

My last visit, last month, we had 6 Stripers, 37 Dorado and about 900 lbs.
of Yellowfin over 3 days. That's a pretty exceptional total-catch for a
3-dayer. I've never had that in the good months when the big Marlin play.

Right now almost all the boats are up for steep negotiation. I got a
beautiful 36' Bertram (El Peleodora sp?), Capt and mate for $ 1,125.00 for 3
days. Fuel and live bait on them. We released the Marlin and Dorado and the
crew took **all** the tuna but a few pounds we had the hotel chef cook up
for us.

Anyway, I think the fishing is far better than the diving.