Staying at AKL really is a special case, tink, for a couple without kids in tow, in this day-and-age of relying on Disney bus transportation (because of how great of a service Magical Express is), and so I think it does present a special challenge for us in that situation.
We're also not park-hopping this year, so that means we're only going to be doing at most two Epcot dinners. Another complication that we've not had to deal with much, in past years.
I see The Wave almost as an inevitability, unless some folks strongly convince us otherwise, just because of the dress code limitations associated with California Grill, and the impracticality of going back to the resort to change for dinner. Either that or just not plan on an evening at MK, and have yet-another meal at AKL.