You said you pulled belts to narrow it down to power steering or water pump. Did you pull that final belt and run it to verify the squeal was gone?

How's the pulley alignment?




.