That being said, I'm going to look at other options on my next visit and want a hotel and diving combination that doesn't require me to take a taxi to go diving.
Very easy to do. Either with hotels that have an on-site dive op or allow other dive shops to pick up at their pier...or several places in town and use a dive op that picks up at the Aqua Safari, Aldora or even Barracuda pier.
This gives you beaucoup options.