[Trackrash]

Your best bet is to rebuild the motor you have. You know it was running OK. No weird noises or abnormal smoking.

It wouldn't hurt to look around for another motor to swap. BUT unless you have an iron clad history on the new motor, you may not be ahead of the game. Lots of "rebuilt a while back by some German guy, but I don't have any receipts" stories, so be careful.

In this month's Panorama there is a horror story about a guy who sent his motor to some shop in LA only to get ripped off, so do some research on the places you send parts.

Here is something to consider. Use a mirror or jack up the car and look at the cylinders. Count the cooling fins on the cylinders. If they have 11 then you most likely have Mahles and there is a good chance they are re-useable. If they have 10 they are KS and will need to either be replaced or honed, plated and new pistons installed. Good news is, you can upgrade the cylinders to get 3,2L for about the same money as the stock 3,0, with KS cylinders being re-worked.

Good luck.