get an i7 and high end components, like 16gb of ram, etc. You're shooting for productivity, so i'd also recommend a discrete graphics card so it can process its own VRAM, allowing the CPU + memory to free up on its usage.
I'm confused why you included a Macbook Pro remark. Of course it sucks...