You are spot on, I already have a buyer at the machine shop and I plan to get the pistons, rings, bearings and possibly main studs in exchange for my long block. I have an extra oil pump from an 01 that I am going to port the casting on.