If you're really in need of a new machine right now, why not get the iMac Pro? I am currently in the same boat as you with my aging Mac Pro.. but I'll hold out until 2019 when they refresh the model. What's stopping me from the iMac Pro is that I don't need the 5K display and would be paying for it.