Take your old engine out, scatter it on the bench, put a $1600 rebuild kit in it with MAHLE pistons, have a GOOOOODDDD machine shop machine it and check everything, forged rods are tougher than you think. Deck the block, put some new cam bearings, bore it, freeze plugs, and a good hot tanking...