I had those exact same symptoms. Check the water pump. I just purchased a nice little cj for cheap because it had a "knock". Turns out it was...
Separate names with a comma.