Another alternative is one of HP's Elitebook series with the dream color display (IPS). Gets you up to three hard drives (I'm thinking ssd for OS/apps, and a 1tb drive for storage.) Also, workstation graphics in either the AMD or nvidia flavors.
I am capable of building my own PC. Have several spreadsheets made with different configurations. Ultimately, portability was what made me decide on the HP.