I need to check the flow. It probably wouldn't hurt to just get a new water pump anyway because this one is pretty old and rusty. For all I know it's the original one.

I worked on the timing again this evening until it started to boil over.