Just be sure to start your climb up Diamond Head as early as possible. It gets really hot as the morning wears on. I have heard they now have lights inside the tunnels. When I did it we were at the mercy of the people in front of us with flashlights.
We also loved the Waikiki Aquarium.
Have a great trip. I will be there next month.