Yeah, I think the MBA13 (8GB) or the rMBA15 are the two most optimal choices for "primary Apple machine for most high-end users".
That said, I welcome they day when I can buy a >= 24 inch retina desktop monitor and I full well plan to spend a buckload of money on it as soon as it becomes available. (IF it is compatible with both Macs and other computers. That is a requirement)