Which Driveshaft?

[sprnova]

I am installing a '99 M3 engine and transmission into my '95 318ti club sport. I have looked at the ETK and found the following info in regards to driveshafts for models with manual transmissions:

1995 M3: Length = 1469 mm
1996-1999 M3: Length = 1492
1995 325i = Lenght = 1512 mm

I am wondering if anyone knows which driveshaft is the correct one to use, or if it even matters? I have a '95 M3 driveshaft but don't know if it will work based on its shorter length (approx 3/4" shorter) compared to the '96-99 M3 driveshaft.

In addition, the '95 M3 driveshaft uses a 6 bolt CV joint on the end that connects to the differential, whereas the '96-99 M3 driveshaft uses a u-joint.