S50 + ZF 5spd Which shifter will work?

[Z2TT]

Hello.

I currently have a E30 with a Z3M Shifter and UUC DSSR Link, will be putting in a S50 engine and using a 5 Speed ZF Box.

I really like the look and length of my current shifter, but I have been told it's the wrong geometry for E30's.

I'm wondering can I make my Z3M Shifter fit after engine conversion and for the DSSR not to rub on the Guibo?
Can my Combo be used or will it simly not reach the gearbox?

Is there any other good shifter that will work, such as E36 M3 or E46 M3 Shifters are the same height as the Z3M Shifter. How about which Link to use that will mate upto the ZF Box?