I would clean the intake screen one more time. Sounds like the pump's cravatting.
You did say you replaced both brakes......
Have fun,
John