They will be releasing the new Tracer 900 next year, with a few upgrades.
Official: Yamaha Tracer 900 and Tracer 900GT | EICMA 2017
https://www.youtube.com/watch?v=LDm9Z2DX8rY
Might be a good opportunity to pick up an older FZ-09 or MT-09 off the shop floor for a reasonable price...