My winter 818 project will include rebuilding my 2.0 turbo and some modding. I would like to add an engine oil cooler. I would also like to delete the subie "oil/water separator" as the water hoses are prone to leaking and I don't believe that the device provides any oil cooling. Is there a way to completely remove the unit and replace with an oil delivery block? The available kits appear to have the delivery block added onto the separator.