Your clicking noise sounds like what I am experiencing with my Juiced Rip Current S. It has the same Bafang motor as your Cross Current. Do you think that the motor cover/freehub alone was the solution? I haven't had any problem with the clutch so hoping I don't need to replace that too. Can...