Also decided on a new machine (2013 Macbook Pro with 6TB external wasn't cutting it). Ordered one of these:
27-inch iMac with Retina 5K display, 4.0GHz i7, 32GB, 1TB Flash Storage, AMD Radeon R9 M395X w/4GB
Hope this is helpful to someone in the same boat
27-inch iMac with Retina 5K display, 4.0GHz i7, 32GB, 1TB Flash Storage, AMD Radeon R9 M395X w/4GB
Hope this is helpful to someone in the same boat