[F87source]

Originally Posted by 1mm2

This is it, until warranty expires.

Then maybe review Gintani solution if keeping long term.

TBH the vtt spline lock solution sounds promising too, plus you don't have to pull the motor apart to the same extent for drilling the crank.