Is the fan clutch good, so that when that engine is quite warm the fan in front of the engine is blowing air pretty strong? If not, that fan clutch might be turning/spinning but just "free-wheeling" and not blowing enough air to cool the coolant/engine. This was the problem with my '90 535i recently. Pretty easy fix.