While I have to go along with those saying it does sound like the pump it also seems to have issues that are not.
Have you received any codes?
If your check engine light has come on there must be a trail that the dealer could tell you of at a minimul cost.
I must also state that the Bosch pump failure is inevitable and for the cost of the Johnson replacement pump it maybe should be swapped just as a procautionary measure. When ever you can increase the performance of a part and save the trouble of a unexpected brakedown which is the case for this pump, for a couple hours work and $150. it's worth doing.
Wish you were closer so I could give you hand.
Good luck,
Mike