Haz, so much trouble to arrive at the same at the end. Washing your engine block with rags won't fix your car. Here in France used Boxster engines are $3000 so maybe you should think about importing one from FR and move on with it.
I don't think the IMS change @ $2,500 is worth it anymore these days
