e36 Manual Conversion - Shifter linkage problems

[TimTam 0]

To cut a long story short, I've gotten a donor e36 318ti for my manual conversion into my 328i coupe but I'm having issues with the shifter and selector rod.
I read somewhere on here that the 4cyl shifter is 25-35mm longer than 6cyl getrag - So I've cut and welded it shorter by 25mm (after some careful measuring and hoping I'm not doing the wrong thing)
Now the shifter stay/arm fits great (sits central and not at the back of the hole) buut now the selector rod is 25mm too long.
Should I just cut and weld the bent selector rod (PN# 25111222203)? Or should I get a straight one from a 320i/323i (PN#25111222664) as they're still designed for the getrag box and the 6cyl motor.

Any and all help would be greatly appreciated!
Cheers!