Build the stronger bottom end. It would be a shame to possibly hurt a nice set of heads, cam, etc. if your current shortblock bites it.