If all else doesn't solve the problem, before doing major surgery on the engine, don't rule out a worn out water pump. It may have enough flow when the thermostat isn't installed, but it may not with it in.
A thermostat doesn't restrict the flow much, but it may be just enough to cause the engine to run hot.
