A quick update...
Last Saturday, it was our 17th year anniversary. DW gave me a surprise present. Initially, we were going to stay one night at Doubletree Castle hotel before we get to WDW. DW just gave me the confirmation that she booked an extra day at WL with 40% off

so we don't have to stay at Doubletree anymore.
Although we didn't have any dinner plan in Disney for that night, but I am sure it won't be hard for us to figure some thing out. All the restaurants in DTD is calling our name already.