We go fairly often and for the same reasons you're questioning your choice, is why we end up at Dolphin or Swan more times than on disney property in a moderate. It's so close and price and you get walkability/boat to two parks, the boardwalk and dining options. We really love POFQ/POR for the theming but you can't beat the deluxe amenities with S/D. EEH at Epcot are really great and for such a short trip, I think the extra cost is worth it. I wouldn't even bother with OKW for such a short trip, it's bus only to the parks and not worth the extra cost for such a short trip. Yes, the rooms are nice and big but unless you feel strongly about everyone being in one room, it's not worth the extra $.