Yes, I’ve figured that and I have taken advice from fellow bikers, and will do same as you have, upgrade but stick with OEM ratios.Hi Ev
I've got original ratios with supersprox front & rear sprockets plus a DID X-ring gold chain - all components have been spot on.
I know what you mean about being in 6th gear at lower speeds; I simply don't use 6th until I'm at a higher speed that 'suits' the engine.
Oh....and mine is a 2015 SA-T so a little older than yours.