Fresh best bet get a spare short block and build it so that way when you swap it no down time. Get ARP head studs and multi layer head gasket. I can make up a list of parts I got on my block. I had my k20a2 block bored from 86mm to 86.5mm with eagle rods and wiesco pistons. I went with 10.8:1 compression so its close to stock but its good enough the block can handle 700. You could sleeve it for extra protection but I can get it all. Maybe I can do a whole package deals. Oh also get someone to help on the main bearings! Its took the, 4 tries to get the correct bearings since two were different. Get all new gaskets, O rings man.