I use Aldora dive op on Calle 5. (look up aldora.com) They have fast boats that get to the dive sites in minutes. They leave at 7:30 from their down town dock, but will gladly pick you up at the closest dock to wherever you are staying. After the first dive they go to a nearby beach where you can drain off some nitrogen for about 45 minutes to an hour. Again with their fast boats and the close proximity to the beach it only takes minutes to get back and forth. The terraferma aspect is nice. Beats rocking around on the boat killing time. I was typically back on my dock between 12 and 12:30 each day. They go out again at 2:30 for a third dive for those interested. Night dives are Wednesday and Saturday. One of their selling points is the 120 lb steel tanks. Gotta love the extra downtime. But to me the best part of Aldora is the obvious pride and professionalism each and every member demonstrates. They clean you gear each day and it shows up dry the next morning. I like the personal touch.
Good luck
Good luck