A few thoughts:
I think they really make the package deals confusing to figure out if you're saving. They are making you get park hopper for about $130 more to get free dining. As a first time visitor, I would skip park hopping and just go to one park a day. I think park hopping is more fun for people that are more familiar with the parks and overly time consuming for first timer. (I also think that while TAs are looking for deals for you, they do make more if you spend more.)
If they do come out with say a 25% room only discount, you could get the room for your original dates(13-20) at CBR for about $1200. Your tickets would be $692 without park hopping. At that point, you can figure out if you want a dining plan for $553. That's a total of $2,445 and you still get 7 nights instead of only 6 withe the free dining options. It's possible you'd save more by skipping the meal plan if you just want to have 4 or 5 sit down meals during the time you're there. (For us, we save by paying OOP over the dining plan. Also be sure to consider that you have to add tips either way, but it's more with the dining plan since you'll "spend more" when you order on it.)
Also, I'd go with either CBR or CSR. CBR is the one that has most recently had renovations. I wouldn't pay more for POFQ. All the other mods have been refurbished more recently and POFQ only has one pool that has a very small slide. You can use the pools at POR also if you stay there though, but then you'd have to walk there. If your son likes swimming, he will be unimpressed with the FQ pool.