She's running rich. Look for vacuum leaks. EFI might be trying to over compensate for a vacuum leak.
2psi? Don't think it required replacement. Unless is was deficient in fuel volume??. This is what you need to check, volume. Also your gauge probably isn't calibrated. Yup 2psi is low per the spec per your words. Is it enough to cause your issue??
Ummm, ummm, ummmm. Do we need to touch on this one?
I would look into your O2 sensor. Need to get a wideband O2 meter. See what the A/F ratio really is. Again from up top you said it was lazy and puffing black smoke.
Or that is some dumb EFI system that doesn't read the O2?? Like an old school mechanical FI.