I'm going with PapaBill and say take the two island land package holiday. We stayed in Waikiki for three nights on a stopover and loved it. Looking forward to going back too but would not bother doing a cruise, too much to see and do on the islands. If you really want to cruise go to the Caribbean instead.
Of course this is only my opinion and you will do whatever you choose and I really hope you enjoy it!!! Have fun.