87 TBI Running Hot

[Whorse]

I've been having a bit of trouble with my 87 running hotter than I'd like. Before it was overheating a bit, and at one point I blew the camshaft plug off the head and had a nice oil leak from it. Since then I've done a small check of the engine, and it doesn't look stellar, but there's no water in my oil and no coolant leaks.

I replaced my thermostat with a brand new one, and it has helped a bit. My timing was quite retarded (literally), so I bumped it up from 0 to 4 degrees, and it runs a little hotter, which bothers me because the stock timing is 12 degrees. Is there any way to diagnose this without actually changing my water pump? I've done a full coolant flush, and run a cleaner through it as well. The Thermostat helped a bit, as it doesn't overheat, but it still runs a bit hotter than it should.