Trade 2007 Kawasaki 650R Ninja for 2018 MT-07?

I keep on hoping one of the Big Four would build a clean two stroke sport motorcycle, but I suppose that won't happen. Right now I have a 2007 Kawasaki 650R Ninja which is a pretty fast highway bike for a 650 with the help of the fairing. Would it be worth paying more for the 2018 MT-07 if I traded? I read they are upgrading the suspension on the MT-07 for 2018. Thank you.