I need a new machine, and Im having a really hard time deciding. The purpose of this machine is to consolidate my computing to one primary machine that can be used back and forth to work. At home, I have a 24" 1920x1200 to plug in to, but at work it will be on the laptop screen. I am a server engineer, and plan on running some VMs in Virtual Box. So I will push the processor some for sure. Im having a hard time deciding between the i5 with a screen upgrade, or an i7 with the std display. I will be upgrading either machine with ram from OWC, so that will help either with the VMs. These machines are basically the same money...which one would you buy as a desktop replacement workhorse?