Bahia Tenacatita, Jalisco. Coral reef. Not pockmarked by divers every 5 meters. Air is tough but there is dive air in Manzanillo.
Much of the oceano Pacifico is mar abierto. Cuidado! You will get cheese grated across a rock if you dive when it's rough.
Do NOT have a speargun on you or in your motor vehicle when you dive with air. Bad bad expensive juju and there are a lot of marinas around to put the nab on oyster poachers and lobster poachers. My son is law is a federally registered diver (air) for lobster, oysters, and huauchinango. Red snapper.
You might want to consider tank diving, to locate decent fish, go put the tanks in your hotel room and return and skin dive with a spear gun.
Perhaps the best diving in the gulf of California is off of Agua Verde, just south of Loreto. The road was destroyed by the hurricane but by next winter it should be fine. Hire a panga at the village. Go to the south end of isla sta catalan. Do not dive on the north end. Sea lions and great white sharks. At the moment the north end may have tigers. The south end has a spine of rock descending and you can sometimes catch a grouper.
Hope this helps - saludos