Starter motor problems 961 -Greg

Today I broke a starter shaft on my 961 ,lucky for me it jammed on top of my gear shaft and not my primary drive.Can anyone help with this poorly designed shaft,I have ordered a new starter but parts seem to take years before they get to Australia and I can't ride my $32000 bike. So can anyone help with this problem as my mate Tiedy has the same bike and is concerned it might happen to him. Greg (Australia)