Welcome Noctonlincs, a fine choice of bikes!
I followed almost the same trajectory - a 2011 bike for 4 years & put 28k miles on it, and then bought a 2015 Motorsport last year with 7k miles.
My thought process was in, rapid succession - they've stopped making them - I like them enough that I want the latest - oh, they're virtually all Motorsport versions - oh well, it gives me a choice to try all those extras bits - oh I've bought one. I'm not regretting it.
I find the Motorsport parts don't make a lot of difference other than sharper looks, but I'm a fairly insensitve soul. I think you're right about possibly slightly more powerful, better brakes (and more vibes, but that may have be down to mileage since the vibrations are easing off now at 18k miles).
Interesting to hear what you think of the TFT display - never used those. They're quite rare.