2005 Chrysler 300 Running hot

My car runs hot and when over heated it shuts down completely until it cools. This problem went on for 2weeks and I put water in it everyday after purchasing antifreeze and it leak it all out when it was overheated. The following week up until now(which is almost a month now) the car is not running hot at all, when I drive a little distance a portion of the water will leak out under the car. Before when it was running hot I would hear a clicking noise which would let me know that the car was overheating and I would then park it. I do not know if I need to get a water pump with the timing belt or another hose. My question is with the miles at a high is it worth me getting the timing belt and water pump? Or is it that the problem with the car?