I have had good luck with Papa Hogs for diving..its been a few years but I imagine they are still there. I stayed twice at Plaza los Glorias..not cheap but first class, it is close enough to town to walk and party..far enough to be quiet..and right on the way to all the dive sites regardless of which shop you use.(they Should agree to pick you up at hotel dock) Have a great time!