We stayed at Club El Moro in September. Very nice place. Diving was with Club Cantamar, and you can find tons of info on it on this board, including some from me. We rode north from Los Cabos with Baja Shuttle, which is part of Club Cantamar. We had paid for round trip, but when it looked like we might not make the airport on time, we had Carlos at El Moro set us up with Alberto, an excellent private shuttle/taxi/tour guide operator, who came on a few minutes notice and got us (barely) on time to the airport in Los Cabos. Don't know if he would do it starting at the airport since he is from La Paz (born and raised, BTW), but you might try asking someone at El Moro in advance. Otherwise, Baja Shuttle can be arranged out of Club Cantamar.
We really enjoyed the diving in La Paz, BTW. I know from research that it's quite a bit colder in May, with lower viz, but I still wish I was going! Let me know if you want more info.
