And since it had an EGR code as well, and it uses MAF to verify EGR flow, maybe the MAF is/was the cause of the black smoke?

What is the "fuel corection mm3" at the RPM its missing?

Did you program the injector trim when you installed the injector? Login to read more.