Very simple fix......

Dont know why people shy away from a future maintenance problem..........
IMO.

No Brainer here. No slop.
Just cut shaft about 1.5" drill hole if need to or allen key and lock nut provide stability.
$30 part
D