3 things the water pump have you replaced this at all. They do wear out the vanes can cause cavitation and thus not move water they way it should this is especially common on no MB water pumps. The second is the fan not the auxilliary fan has a clutch on it to control its speed as itiis driven directly by the engine. If the clutch wears out it might not let the fan spin enough or to fast. thirdly you might want to get the radiator recored as this makes it like new and and will cool the water a great deal more efficiently.
hope this helps.