I don't know man. If your fuel pressure isn't dropping and is pretty steady, but you are still having power/drivability issues...... I'd start looking elsewhere in the system. It sounds like supply is good now.
If you are sucking air, it will act like it. Hard starting, surging and the like...