Have you priced a rebuilt long block from Metric Motors? If the pistons alone are $2000, an MB crate motor doesn't sound much more expensive considering the warranty you get with it.

How about cutting your losses and looking for another 2.5?

Sixto
95 S420
91 300SE
87 300SDL
83 300SD