Grant at Amigos is no longer teaching. He is managing FIDO's.
Lorne and Jolene are excellent instructors and offer private service. They generally take you by yourself without recreational divers on the boat so that you never feel rushed.
Look at their website at; http://www.grumpyandhappy.com