Filter first, then check pump if it's still acting up.
A bit of a long shot, but we had a Trans Am that acted similarly, went through all the trouble of changing the pump (pressure was checked, a little low, so axle was dropped, tank was dropped, pump changed, etc.) and it did the same thing...