Just sounds like your pump is on its way out. They do wear out internally. And if your changing it your self make sure you get a good quality pump, napa sells rebuilt ones but as I found out on more than vehicle that the rebuilt ones don't always work.
"I reject your reality and substitute my own!" -Paul Bradford