Just got back from Oahu, and can wholeheartedly recommend both Roger and Lisa of Oahu Scuba Divers, and Gabe with Kaimana Divers. Both are very friendly, knowledgeable, and professional. They went the extra mile to help my wife become more comfortable and efficient in the water.
While we stayed outside of Waikiki, I do believe that if you are in the local area, that both ops will pick up and drop off from your hotel. Give them a call/email, and find out.
Since you are staying in the Hilton Hawaiian Village, don't forget to check out the fireworks every friday night at 8:00. They are launched from your hotel.
Regards,
Gary