Yes, during Summer months, dive Sharks Cove and Three Tables at least one day.
And then for your "something different" than the Waikiki/Hawaii Kai dive-sites, definitely go out with Ocean Concepts on the West-side.
[They'll still pick you up from Waikiki if that's where you are.]
Scuba Diving...