Go with the M40 supports. I did that also and they fit perfect. They also throw your engine 2-3cm towards the rear (nice weight distribution).
And what about the rest of the car?need i change location for the gearbox as well?have the drive shaft shortened?Ron.