Definitely keep going with the internal cleaning!
Are you getting the injectors and EGR overhauled/replaced?

Catch tanks are great for any engine, especially if you are running an engine tune and...