driveshaft fit models 114 - 118 (cv joint)

[drivervince]

Hello all,

I have a 114i (b38-3cilinder) bmw and i have had some shaking in the driveline which i experienced before with a failing driveshaft cv joint.
(when there is some play, a ball can get stuck). back then, i had to search for my teeth fillings, so i am not waiting for that moment again, and want to replace it before it goes.

Since i have chip tuned the car, it would be a good idea to take the shaft from a 118 model, or even a diesel. (nice and sturdy)
i know in the old days of the E30 you could swap pretty much anything out .
with this one i am not sure. OEM shows different partnumbers, even for the same car there are two versions.
Anybody can shed a light on this? Can i take a stronger drivershaft and fit that in? is the 118i even stronger? should i take a 120i shaft (probable doesn't fit)
or is there some aftermarket?

anybody has some hands-on experience / knowledge?

F21 , 2015 with B38.

thanks for the help.