When you had it open for the pump, did you inspect the sleeves? Look for marks on the walls. Clank vs tap is usually rod related. Lack of oil to the wrist pins.. broken rings.. Check the plugs (why dont people check those things anymore?) Plugs can tell you alot. Color / grit on them / oil.
Good Luck.
hr41pearl