Hands Down, no questions asked standard at CR....really any room at CR. Having the ability to walk to MK and use monorail when it's working correctly to Epcot, especially with a stroller is priceless. Plus you'll also have a slide and hot tub at CR, which you wouldn't get at AoA. Not to mention staying deluxe as opposed to value.
Were you nothinking able to get free dining at CR? Also the free dining offered at deluxes is the regular plan with a table service, counter service and 2 snacks, instead of just the counter service and 1 snack at values and mods.