If you are going all out like that, you might want to find a c36 that was wrecked without damaging the engine, and swap in that engine and tranny to your car. It would be the ultimate CE besides one with a 500e motor and tranny and all.
The c36 engine is based on the same block as the 3.2 litre m104 engine.
HP ratings for the 3.2 and the 3.0 I believe are 217, but torque is better ont he 3.2 if I am correct.
Alon