I'd take the GF for the entire stay, and the direct flights. For me it doesn't make sense to pay $800 more dollars for free dining, and to move to a Moderate. I could definitely budget that $800 over 4 days for meals.
Glad you were able to get the value. I am assuming you upgraded your dining plan from QS to regular DDP since the value comes with QS. Personally if I had the chance to be at a Magic Kindgom resort over New Years eve with the ability to watch from the resort and avoid the theme park I would jump at it in a heart beat.