It sounds like a solid diagnosis and the right place to start.

If it cools ok when moving (sounds like it does) that usually means the radiator is OK. Get the right water pump and check again. Next up, if it still runs a bit warm is airflow - fan & shroud.