A picked up another driveshaft at Pick-A-Part this morning (literally, it was lying on the ground). From the top, the Mitsubishi-Mini shaft (too short), a Mini shaft, the new Mitsubishi shaft. The 6 sided thing on the left is the middle of a Mini CV joint, the new shaft will be cut to fit into this part. The Mini shaft looks particularly short because it's the shorter of the standard Mini shafts and the other two are from the long side.
Also of note is the particularly nasty circlip attached to the too-short Mitsubishi-Mini shaft, I'm not looking forward to transferring that again.
I'm only having one of the too-short driveshafts replaced as lengthening only this one makes mounting the motor easier.