Yes replace the air to oil heat exchanger with coolant to oil.
I probably will not have an air to oil cooler at all on this engine.
On my diesel I added an air to oil cooler on a valve that I open in summer and close during the cooler months.
1984 chevy suburban, custom made 6.5L diesel turbocharged with a Garrett T76 and Holset HE351VE, 22:1 compression 13psi of intercooled boost.
1985 chevy camaro mostly stock.