Its not clear to me why you are mad at the mechanic. He didn’t break the water pump, and if he had found it the first time, it still would have cost pretty much the same to fix it. And as for the first time, all you said is that the upper hose was leaking and it was fixed. There’s no reason, being presented with a car with a leaky hose, that one should diagnose a bad water pump.
So I have no idea what your friend thinks you’re being ripped off about or why you’re so mad. If you want to be frustrated with your car then that’s your thing. But so far there’s no reason to suspect that your friend’s dad deserves to get any of it directed at him.
Whine from the power steering pump is perfectly plausible, btw. What did he replace for free? Just a hose? Or the whole pump? If he replaced your PS pump for free then you owe him a big debt of gratitude, not a nasty attitude. Actually the same even if it was just a hose.