Mexican Riviera diving

[rawtravel]

I'll be on Diamond Princess 11/13 Mexican Riviera. I noticed that Princess offers diving in Cabo and Puerto Vallarta. Has anyone dived in either of these ports? Independent or through cruise line? I have never thought about diving in these ports until this trip. Is diving here worthwhile?

[mroyer]

I am on X 11/4 trip and having been looking into this as well. I will probably go with Manta Scuba in Cabo. I will most likely dive Manzanillo as well, but not PV - doing the canopy tour there.