Got a suggestion for your coolant problems, Redline Water Wetter. I don't sell the stuff so my recommendation comes from years of use, I swear by it and use it in all my cars/Jeeps, and will use it in my Dodge once I get it. One caveat, my use has been in gas, not diesel engines, but the theory behind the product should make it just as effective in diesel engines, maybe more so given the higher heat of the diesel.
Redline Water Wetter has some patented chemicals that decrease the surface tension and thereby increase the "slickness" of water. This means you get many times fewer tiny little microscopic air bubbles throughout your cooling system. Which means that you effectively increase the efficiency of your cooling system by increasing the effective surface area of your cooling system and increasing the flow of the "slicker" water/coolant over the now larger surface area. Thus your entire system is more efficent. The water wetter has anti-corosion properties, so you flush your cooling system and use a 80-20 Water/Coolant mixture plus Redline Water Wetter (or any mixture up to 100% water plus water wetter, depending on your climate, the less coolant the better cooling. ) I have always seen a marked improvement in all cars I have used it in, two 5. 0L Mustangs, a 1. 8L Turbo New Beetle, a 4. 2L I-6 Jeep CJ-7. Expect 10%-25% reduction in coolant tempatures in hot weather. I have used the product in Alabama and Hawaii since 1996, so I have tested it in some damn hot and humid weather.
Give it a try and let me know what you think, I love the stuff, and like I said I don't sell or have any interest in the company. Redline Water Wetter (from the makers of Redlines Automotive Synthetic Oils. )
