Pannhead is probably right.
These engines are notorious for running hot, though. Check out the thread "Late model cooling mods" on this forum.
I upgraded my 95 to the dual thermostats and HO waterpump that you have, but still had overheating problems until I installed a Kennedy fan clutch. That seems to have fixed my problems (along with an intercooler).
