The original water pump on my 1967 BJ8 still works fine but has been making some noise for months. I'm curious to hear recommendations on whether to replace it or have it rebuilt. If replace, from whom- I've heard horror stories of low quality pumps being sold. If rebuild, who's the best? Thanks, George Vernau Sr Houston, TX