If cooling issues are your concern, I would think about a thicker radiator, a lower temp thermostat (180* for N/A), and possibly a new fan clutch or e-fan.
I wouldn't worry too much about your water pump unless you NEED to change it. Changing the thermostat was the first step I did in my e-fan upgrade, and my temp needle never even got to the mid point on the stock gauge. Before the upgrades it sat a hair above mid point at normal operating temp.
I have a stock radiator, e-fan, stock water pump, and 180* thermostat...in South Florida..and I never see the needle go above mid. Even when I was at the track on a 99* day, hot lapping, It would rise a hair above normal temp at the end of each run, but was back below mid by the time I reached the slip tower.