If I'm honest with myself, it's probably the new headlamp(s) I really like the most compared to the old one so an upgrade kit would be seriously looked at!
Give it time, you'll be able to get a generic Chinese/Japanese one pretty cheap, an R&G/evotech for a couple of hundred quid and if you're minted, a Rizoma one for about a grand!
The headlights are the one part of the 2017 model I quite like, i'd be tempted myself if the lights were nice and bright.
Actually, thinking about it, i'll bet by summer, there'll have been a few 2017 models that have been stuffed into a tree/hedge/ditch so breakers will likely have OEM lights to upgrade to!