I had the MBA11 for a month. I loved it because it doesn't waste room on all the things I never -or barely ever use- i.e. DVD drive, ethernet, firewire, SD card. But it was an impulsive buy, I didn't really need it, and it wasn't powerful enough to run intensive graphics on an external monitor. So when the trackpad broke after only 28 days, I jumped on the opportunity and returned it.
So based on my own experience, I voted for all 3 remain but MBP13 loses the optical drive. I honestly believe dropping the optical drive on the MBP13 to make room for discrete graphics is a good idea because it would satisfy a need that's not currently well addressed in the Apple lineup: a powerful ultraportable.
Meanwhile, the MB would (continue to) be the perfect laptop for those looking for a small laptop with an optical drive. Right now they have 2 viable options with little differenciation between the two, i.e. the question boils down to "do I spend $200 for a few extra options or do I get the cheaper one that does essentially the same".