Xin can have either the crit or the extra scaling not both
Even then I believe that the crit or extra scaling should only be available when your W is active not as a passive, please this will be the only way to nerf
without completely removing the changes (which we all know Riot won't do).