Have you checked the pressure on the fuel rail to see if the pump is failing?
When mine was giving me fluctuations at idle and rough starts, problem was intermittent crank position sensor.
As to fuel level indication, had that too. But after a few times of allowing the tank to get low, like 1/8th,, and filling, that stopped. Think I needed to let the float full travel to clean up the signal.
Not saying yours is doing the same, but some more troubleshooting before condemning the pump.
Because it is a p.i.t.a dropping the tank to replace it.
BTW, some model, engine info would be helpful.