One more thing to check place your head gaskets on the block and make sure everything lines up correctly. I would do the same on the heads may even put the bolts thru the heads to check the water jacket alignment. Seems like I saw a artical some where about head alignment with water jackets being a problem with a certain brand of aftermarket heads.