change the thermostat first, its cheap and very easy to replace (as long as you don't snap the bolts on the housing that is) and has a tendency to cause all sorts of weird cooling system problems. if the t-stat doesn't fix it verify that the fan clutch is good.