I'm thinking of upgrading to the new 12.9. Either as a replacement for my 9.7 Pro or to compliment it. I was going to get a new MacBook Pro, but even after this refresh, I remain unimpressed with it. Lots of QC issues with the MBP in my opinion.
So, I've started thinking of a different strategy. New 12.9 iPad Pro for portable use (editing photos on the go mostly). The new iOS 11 and Files will help also. Then, in the fall, a new iMac Pro for at home for using Logic Pro, Photoshop, Lightroom and Final Cut.