In the end, another new GM DPF sensor, DEF module and DEF pump/heater fixed the codes this time. Drove it about 200 miles and nothing new has happened.