It sure sounds like the pump. Testing at idle won't give you the whole picture unless it's really shot. AutoZone lends a tester that I believe Tee's in so you can test it under load, if you can figure a way to snake the gauge under the hood edge.
A new pump costs so little I'd be inclined to just replace it, if it isn't the problem now it will be later.