You could also consider checking out the Private Dining Experience WDW offers. I set this up for our anniversary a few years back. Our table was on the dock at GF where the yacht is docked (not sure if that area is still offered). You select the menu/drinks/dessert in advance and they set everything up. You also have your own private butler.
We watched Wishes over dessert and had the music piped in. Definitely a splurge, but thought it was worth it - really a memorable experience. Good luck with whatever you decide, I'm sure it will be wonderful!
Grand Floridian Private Dining: 407-824-2474