I can't decide what I should do with this oil leak and what I beleive to be the waterpump. I already tore the front end apart to replace the opti seal. The problem still persisted which makes me believe its at the WP seal. I have an XE grind with the stock timing assembly with new GM chain. I also have my original waterpump in there with 99k miles and a brand new opti. Im wondering if I should go electric and fix this waterpump seal for good because I have to remove the timing cover to get the seal out. My WP gear shaft had a lot of play in it as well. A new GM shaft is $38 that bolts to the block. Should I go electric with cloyes? Replace stock WP gear and fix the seal?

I would definetely do an electric WP if they were risk free, but I dont want my engine to overheat if it were to die on me. How reliable are the CSI pumps?