It's a lot of effort but pull the crank out and throw new bearings at the current motor. Check there's no metal in the oil pump and strainer and try the motor again. Would rather pull the block out and have the block flushed too but for like 200 bucks you know the motor has good bearings at least.