Does it overheat steadily or just infrequent spikes?
I suspect you need to do the correct burping of air in cooling system. if an air pocket is left inside the system, when it is pushed past the coolant temp sensor, it will cause a spike of over heat.
