330 Cummins 5.9 Aftercooler Bundles

I have a twin 330 Cummins in a 3988 Bayliner. I have had smoke problems since I bought it. The previous owner installed aftermarket aftercooler bundles in it just previous to selling it. Working on the smoking issue I’ve re-pitched the props from 22×22 to 22×21 and had almost no gain in rpm. I get 2700 to 2750 as near as I can tell. Pulling the aftercoolers to clean them I discovered that they have 180 tubes compared to the Cummins ones that have 84 tubes. They are so closely packed that it doesn’t look like air can get through.
Any ideas on what my problem may be, props or aftercooler bundles? I’ve replaced the turbo, had the injectors tested and cleaned the aftercoolers and still get excessive smoke all over the back deck and into the boat.