I'd keep all the stuff on my current motor.. just swap it all over when I get done with the block. All I want is a bare B18C1 block... that's it.
Only things done to my current block are bored over 0.010 and decked...
I wouldn't be losing much at all.