I'm in the same boat..not sure what I'm going to do right now. I was originally leaning towards buying a complete shortblock, but it might be cheaper to rebuild mine with upgraded parts.