Just a follow up to this, we are still having issues and are very stuck now.
Once it DEF/Diesel contamination issue was figured out, the whole DEF system was dissembled and thoroughly cleaned and a new catalytic converter installed.
After all that work was done, we still get P0420 catalyst...