Update: Got a new water pump from FlowKooler, installed it, bolted on the fan, put on the belt, started the car, and SKREEE! The noise is still there, in the same way as before. Took the belt off, no noise. So the only thing left is the bearing in the power steering pump. I'm not mad though...