Seems to be a general consensus here... another option though would be sell the 24-70L, get the version II, and pick up a 135L f/2... Though the 135L is not as versatile as the zoom....
For serious editing, I'd never use a laptop. too expensive, outdated too quickly, Run too hot, screens too small, too slow.
Desktops are far more powerful for less $$$ and could be built to any spec needed, upgraded, run cool, and can have large screens.
Sounds to me like you're using too wide an aperture, meaning too shallow a depth of field. Recommended reading: Byran Peterson's Perfect Exposure.