Stuff on the way!

I've ordered the stuff to replace the shaft from bikebandit.com. Hopefully It will be here in the next couple of weeks, it's been one week already. I decided to just go ahead and replace everything, including bushings, springs, washers, while I was in there anyway.
Here's the parts list from bikebandit:
H/LIGHT & IND BRKT,LH,CHROME,B : 1396967 (5575423-001)
CIRCLIP : 1380659 (5559024-001)
CIRCLIP : 1380659 (5559024-001)
WASHER,THRUST,12X18X1.2 : 2126306 (5559043-001)
SHAFT ASSY, GEARCHANGE : 1378708 (5557073-001)
BUSH, SPRING LOCATION : 1378712 (5557077-001)
RETURN SPRING, GEARCHANGE : 1378704 (5557069-001)
BOLT, SPRING ABUTMENT : 1378705 (5557070-001)
GASKET,SUMP 3CYL : 1388088 (5566524-001)

I've also ordered a folding shifter from Faster Minis. This should fit the legend, and will hopefully fold up if the bike goes down again, rather than breaking the shaft.

In the bikebandit parts list, you'll notice "H/LIGHT & IND BRKT,LH,CHROME,B" is not part of the shift assembly. I decided to go ahead and replace the one I hacked together with wire and JB weld, because I ordered a flyscreen! Hopefully, this will push the wind off of my neck-it's next to impossible to go past 60mph, because of the flutter against my throat. Here's a thunderbird with the same flyscreen: