We stayed at Club Cantamar 2 years ago, and were fairly happy. The hotel and restaurant were fine, but somewhat less than a resort. It is fairly well isolated from any other civilization, seeing it's about 30 minutes out of La Paz. That's not all negative though. It does mean you will be maybe an hour closer to the dive sites.
About the dive op, Baja Diving, you will be better off with your own equipment. There weren't any dangerous situations, but just a few niggly little problems that were taken care of upon our return to port. I do recommend a full wetsuit. It's not the temperature, it's the jellies, many, many 1/2 inch long little jelly fish that hit you as soon as you hit the water. Even our shorties didn't help. They nailed the back of both knees as soon as I hit the water on the first dive. On the other hand, you get so used to them , it's like being outside with mosquitos all around. You hardly notice after a while. The diving is definitely more on the advanced side. El Bajo is a set of open water pinnacles that top out at about 60-70 feet, and bottom out arounf 110 feet. There were more morays than you could count. Once you get away from the pinnacles you are in blue water diving; no visual reference except you depth gauge. It's kind of unnerving the first time. My wife got narc'd at about 80 feet and had to cut the dive short. Unfortunately, there was a hurricane that passed within 300 miles of Baja and all of the "big fish" went into hiding for a while, perhaps into deeper water. I'm hoping our return trip to Cantamar in 2 weeks will be luckier.
I'll post a dive report when we get back.
Good luck!