I just have to continue to disagree. OP is in no rush. The '18 will be one of the biggest leaps in power we've seen in a long time. Yes, the new keyboard may not have much different travel, but I sure hope they find a way to make them more reliable because no one on here is going to want to pay $700 to replace a keyboard in 2, 3, 4, or 5 years from now.
This is one of the easiest wait instead of buy now times for anyone that doesn't desperately need a replacement ASAP. (machine failure, etc).