Earlier this year I purchased the 2017 CC, but with the arrival of the CC-S on the market, this has now been discontinued. Could someone out there let me know if any upgrade options will be available to CC owners such as myself. Of particular interest to me would be upgrades to the motor that...