I removed the front driveshaft and drove the bike around to confirm it's the driveshaft. It has too much play in it and when coasting from 20mph down to about 10mph it makes a hellacious rattling sound only in a certain RPM range. A guy on FB said this was a manufacturing defect and CFMoto replaced his, but mine has been out of warranty over a year now. Has anyone been able to shim this out, or does anyone know the part number of the updated shaft that will fix this? It's driving me insane.

[2015 Z Force 800 53/Trail EPS]

Just go to any CFM parts house, look it up...then buy it. If the unit has a superseded part number it will be listed as such.