To further the thought - IF you are into rebuilding it, the GUTS from later 18s will fit within your '58 block. If you tear yours down, punch the pistons out and can hone the cylinders well enough that they're cleaned up and not too hogged out, you can transfer the crank/rod/piston bits from a later 18 into yours. I don't have parts book in front of me, but I'd guess as late last 1967 will work. 1968 & up they went to beefier cranks, 2-ring pistons, etc. so interchangeability gets dicey...