I had the same problem on my 99 and ended up being the water pump. There is a away to check it on the under side is a little ball bearing and once it starts to barely drip the pump is gone. I went to turbo city and got the high flow tstat housing and new tstat since opening it anyways and high flow pump. Flushed the radiator (I am running a 3 core all metal, not stock had this before heat issue). Fixed all the overheating issues.
On a side note, for cooling I removed the clutch fan and added an additional factory a/c style to it. I had already gone through few junkyard fans and had a cheap parts store one catch fire. I knew the old clutch fan studs cause clearance issues but decided I will never go back to the clutch style. I put some lock tight on the nuts to keep pulley in place then cutting the studs flush to the 4 nuts. Bingo the factory style dropped right in and cleared. It's a strong fan and what's nice is not only does it have it's own shroud but the factory tabs on the bottom still locked in since that mount area is for LH drive or RH drive. Still haven't decided what wiring I'll end up doing but for now the stock one is still set to a/c and factory 217 kick on, new one is on adj. thermostat with relay to acc.