would it be better if i just get a new swap? and another addition the oil is leaking...
most of the time it is cheaper and easier just to get a new used swap. its all up to your personal preference, new 0 mile rebuilt engine or a used engine. your call.