Welcome!
The black smoke may indicate more injectors going bad (unburned fuel). Also, has the injector control pressure (ICP) sensor been changed? Mine went bad last summer and it's fairly common. I don't think it's the HPOP and the oil is probably fine if you're using a CI-4 or better.