Yes that should work (not having done it but having looked at pictures of the assembly).Yes I think I had better order a pump.
Do you know if I have to take the fan off? Looks like I could just undo the four bolts that secure the pulley/fan to the front of the water pump and remove the pulley and fan combined without having to remove the viscous fan itself.