If your going to fit new bolts, shells and a pump, why don't you just do that on your current engine, along with a crank re-grind?

Thats what i'd do personally.