I think the timing of the new Z may work out well for me. I just purchased my 2015 almost a year ago and plan to keep it another couple years. And I'll be investing in a CSC delete and new clutch shortly which should give me reliability in that regard, and get my investment dollars back during those two years.
Hopefully by then the new Z will be shaken down, gremlins uncovered and aftermarket parts available - ready for me to grab one...