Cabo Acuadeportes - wave runners, water skiing, snorkeling, diving, instruction.
Cabo San Lucas Water Sports - parasailing, wave runners, and kayaking.
Cabo San Lucas Water Sports - sunset cruises, sailing and snorkeling.
JT Watersports - Kayaking, snorkeling, wave runners, cruises, whale watching, glass bottom boat tours ($10 USD).
Land's End Divers - full range of diving and snorkeling.
Pez Gato - Gold Coast sailing tour (11:30 a.m. - 1:30 p.m.), snorkeling (11 a.m. - 3 p.m., $45 USD, open bar and lunch), and sunset cruises (6-8 p.m., $35 USD, open bar and munchies).
Tio Sports - SCUBA diving, snorkeling, ocean kayaking, and ATVs.
Water taxi tour info - http://members.virtualtourist.com/m/68e0a/e2d4b/4/