Rugo,
I had to send a GMC water pump in to be rebuilt because I couldn't locate a replacement. I ran that engine for a few years without any water pump issues. For the past year, I've been running a Chevy 235 with a NAPA short shaft water pump without any problems. There are some recommendations in this
thread.
Let us know if you come up with a solution.
Good luck,