I think I got it fixed. I replaced the water pump and put a 7 lb. radiator cap on (still have the 180 degree thermostat on it). I also rodded out the block while I had the pump off, and I had the radiator checked at a radiator shop.

The engine won't idle unless I keep the choke pulled out. Does that mean I have the carb too lean?

Now I seem to have a terrible clunking noise coming from the bottom of the engine after it's been running for a few minutes. I hope it's not a bearing going bad.

I checked the fan for clearance again since I did all this monkeying on the engine because I thought maybe the noise was the fan hitting the radiator tank. I pulled back two of the blades that looked too close. I'll try it again tomorrow.