Do a cleaning and lubrication on the Bosch starter, replace brushes and the OEM starter will last your lifetime .
Now, if my starter wasn't economically rebuildable, I think I would go with the Nippondenso starter, Motorrad Elektrik had them on their website, but checking today, I can't find it there .