Mac advice

Hi
Advice please.
I currently have an old Mac Pro (2006) and Eizo CG19 monitor. The Mac Pro was getting a bit old so I now use my 2010 Mac Book Pro with the Eizo. Its still bait slow when editing images. I shoot wine bottles in a studio just with a DSLR. Colours should be correct but the images aren't super colour critical as the clients just don't need or know too much about colour balances. As long as it leaves here all OK then thats fine.
I'm wanting to up grade the Mac and screen. Options please on the new iMac 5K 27" desktop or a Mac Pro + which monitor? Part of me thinks the Mac Pro is just overkill for what I need but are the Mac screens really as bad as people say?
Finally, I use C1 Pro 7 with OS 10.9.4 and have never had any issues / problems. Is this the case with Yosemite and C1 Pro 8?
Thanks
Advice please.
I currently have an old Mac Pro (2006) and Eizo CG19 monitor. The Mac Pro was getting a bit old so I now use my 2010 Mac Book Pro with the Eizo. Its still bait slow when editing images. I shoot wine bottles in a studio just with a DSLR. Colours should be correct but the images aren't super colour critical as the clients just don't need or know too much about colour balances. As long as it leaves here all OK then thats fine.
I'm wanting to up grade the Mac and screen. Options please on the new iMac 5K 27" desktop or a Mac Pro + which monitor? Part of me thinks the Mac Pro is just overkill for what I need but are the Mac screens really as bad as people say?
Finally, I use C1 Pro 7 with OS 10.9.4 and have never had any issues / problems. Is this the case with Yosemite and C1 Pro 8?
Thanks