That's closer to my original calculation, because you posted around $2185. But how does the $250 apple care work for retina? Apple's website lists the extended warranty for rMBP $350.
And were you able to sort out the mistake in order?
When you are eligible for the Education Discount, its not just $200 off of the order. You also get discounts on the upgrades including processors, RAM, and AppleCare.
The mistake was sorted out. I could have canceled the order and placed a new order but I decided to pay difference. I figured the cost vs the delay and specification increase was worth it but mainly due to the delay of reordering. If I had the choice to get the 2.3/256/16/AppleCare RMBP without delay, I would have went that way instead.