With a three week stay, you might find a mod more comfortable, and, as you noted they include QS Dining.
It's worth looking to see which Mod is cheaper. When the 2016 deals came out, CSR and CBR were both cheaper than the Port Orleans resorts by a not insignificant jump... and still have the QS dining. That's why we went with CSR over POFQ, and it has way more amenities as it's a conference resort as well. Pete Werner describes it as a Deluxe resort with a moderate price tag, and whilst I think it won't be the same as a deluxe, he's not someone who is shy about calling out bad resorts!