They did the full tour it included a dinner at 'Ohana and the fireworks cruise. (I see you've been trying to get a reservation there)..Good luck whatever you decide.
I find the web site way too confusing! There are things travel agents know that the web site doesn't tell you.
I would look for an authorized Disney vacation planner