Schlegs you asked for my opinion, I think you should try these. Or try swapping yours left to right first, then see if the clicking goes away. But it depends on how often you like going in there.. if you don't want to pop spindles for another couple years then I'd go down the same path Dan did here..
82 fj40, 99 uzj100, 06 gx470
97 DR650, 05 525EXC, 01 XT225, 89 TW200, 09 TTR125, 07 TTR90, 07 CRF50