You could also safely skip Waikiki. Interisland flights are cheap, so after UA drops you off at HNL you could hop the short flight to Maui.
I love the Wailea Marriott, so good choice there. And if you skip the two nights on Oahu, you could book another 7-night package on Kauai.