I'm in the exact same boat right now. I'm swapping my 500 out for a 518. All new 3/8th hard line with a stacked plate cooler and a Turbo Action 17809ST converter will compliment it. I'm leaning on going the the factory cooler in the radiator, and then out to the aftermarket cooler.

1987 Fifth Avenue - 512/518/D60