I'd do a 325, honestly. A 325 would carry you all the way to wheel to wheel racing if you want to go there. E36 318s are, well, something that you can't really grow with. The M42 is a completely different beast in an E30.