I voted Aulani. Everything on the island is just so expensive. Our trip this past summer all together cost me $38,000. Yeah that was for the whole family and roughly $11000 were flights. That still left $27,000 for the total and I have never spent that much at WDW. We did the same things too with the exception of the luau.
Don't get me wrong, I loved the trip. Aulani is drop dead gorgeous and my grandtinker loved the man made reef even though the water felt like winter.