Well if your mechanic isn't ripping you off and really changed the thermostat and your fan is turning on when it should you might start with a new radiator cap. Normally when a waterpump goes it starts leaking so is there any antifreeze leaking anywhere? How is the fluid level in your expansion tank? Also may need to flush your radiator.
