I would keep the Hawaiian cruise and add Club Orange for $15pp per night. I have recently just returned from 21 nights on the Rotterdam in Club Orange. The Club Orange restaurant was terrific. You can dine at dinner anytime between 5 and 9pm. The restaurant is also open for breakfast. My only problem is that in future it will steer me towards the Pinnacle Class ships as they are the only ones that have the separate Club Orange restaurant.
I have sailed on Sky Princess, Discovery Princess’s sister ship. The ship is beautiful but everything is centred around the atrium. There are no nice spaces like the Crow’s Nest where you can relax and just watch the ocean.
Also I found the food better on HAL.