had that noise u described already and it was the headgasket being too thin, the piston was lightly tapping the head. i switched to a thicker headgasket (a composite one and the noise vanished) b4 u do anything else get a thicker headgasket and ur problem will be solved