Thanks for the information.
La Bufadora is about 20 miles south of Ensenada and has great diving (cold though due to a local upwelling). However there are no motels and most people camp or stay in the bunkhouse. There is also a 2 BR villa a short drive away. The diving is off small wooden pangas-not for everybody.
BofLA is on the Sea of Cortez about 300 miles south of Ensenada and supposedly (never been) a great place for whale sharks. It is, however, highly undeveloped. No electricity, bring your own water, satellite phones only, and the nearest fuel without going further south is 175 miles away. Should be an interesting week.