Does it ever over heat when driving it normally- flat ground, 2wd? When it over heats does it peg your gauge, and are both the radiator hoses (upper and lower) and the radiator all about the same temp? The reason I ask is because water movement in the radiator doesn't alway mean the water pump is pumping. Most water pumps just have the impeller pushed onto the driveshaft and I've seen where the impeller becomes loose from the shaft and doesn't spin.
The water looks like it moving and is moving but only because the water or coolant is boiling in the engine, and boiling water moves. Also how are you determining the engine is over heating? by the dash gauge or is it pushing fluid out the over-flow? One more thing is, have you ever washed or blown out the debris from the radiator fines so its getting good air flow through it? I hope something in my ramblings helps you some how!
Caymin