Fan /Water Pump

[JOES31]

Finally after finishing the complete upholstery I took the 31 out for a drive. Drove great. I started to notice little specs of something on the windshield. Opened the hood and found the specs all over the firewall. So I took the leather off the water pump and there it is....leaking.

So two questions. Snyder's has three different pumps along with the rebuild kits. Since I am a newbie could someone point me into the right direction. New pump, which one or rebuild the old pump?

Now while I am at it I read the post about the fans. I now have the original 4 blade fan. Should I replace it so it doesn't cause a disaster? Can I drill out the rivets and install say 1/4" allen bolts through the fan and pulley. If I were to replace it should I use the aluminum or plastic fan?

One final note. When you fix something on a Model A does the car know you fixed it and makes another component go bad? Seems like they always want to be pampered and I already have a wife I have to maintain!!! Good thing I like to work on cars.

Any advice is very much appreciated.

Joe