It looks like what you are spending for your room only is about 1584 + food (934.50 for room, 650 upgrading tickets.)
So with the idea of adding dining to your discounted room, we can make a better comparison of like packages. I think this is how the numbers would work out. Definitely double check when you are booking - they are all awful close; if I'm even a little off on something it could make a big difference. I manufactured the cost of your room based on the savings you listed, hopefully it is right. Let me know what the right rate is and I'll adjust it.
6 nights -
Room Discount, QSDP = 2689; 934 room, 337 1 day tickets, 650 upgrade GAD tickets, 768 QSDP
Room Discount,
DDP = 2929 (above plus 10/person/night for upgrade to ddp)
Free Dining = 2847; 1557 room, 640 2 day tickets, 650 upgrade GAD
7 nights -
Room Discount, QSDP = 2817; 934 room, 337 1 day tickets, 650 upgrade GAD tickets, 896 QSDP
Room Discount, DDP = 3097 (above plus 10/person/night for upgrade to ddp)
Free Dining = 2847; 1557 room, 640 2 day tickets, 650 upgrade GAD
BTW - I'm not a fan of having tickets for next time, just look how confusing it is making it since you want a package, but need to utilized existing tickets. However, having leftover tickets is where your savings of having a dining plan over room only will show in this case.