Try this, unhook the heater hoses and feed the water pump heater hose inlet with the garden hose. Let the other outlet dump out on the ground. Adjust the water flow so the engine maintains temperature while adjusting the timing and carb. You need to eliminate a few of the variables before moving forward.
Joe