Have you checked the CPU fan? If it is dragging (running slow or intermittent) it could create the overheat issue. Did you pull the CPU? if so, hopefully, you applied heatsink grease as is called for.