...(except new file-fit rings) just like that, the overheat and the lock-up were solved.
Then I increased the minimum running temperature to 207*, and it still didn't overheat. Then I retarded the timing, still no overheat. Then I put a clutch on my fan, still no overheat. That was ~2002...