Wait! Before you do anything else, check the O-Ring under the PS reserve tank! I am willing to bet that is your problem. It is a $1.00 part and can give all kinds of symptoms. Do that first and if that doesn't fix it, we can go from there.
Members have replaced PS pumps and still had problems and when they replaced the O-ring, all problems went away. Good luck.