Ok update here, I dont know if I solved the knock noise or I was hallucinating, but now I have more of a metallic rattle, If I goose the engine as it come back down to idle I get the rattle noise as best as I can tell it is loudest at the water pump, but this is with the fan belt disconnected. Is it possible there is a broken part in the water pump just rattling around?