Yes, it definitely worth if you are going to get more power for the M42 motor (either thru FI or rebuilt).
I am not sure about the gear ratios for the M3 tranny but go for the 6 speed ones. It will be more fun driving on the road. Btw, I think you have to change the drive shaft as well.