Just looking for some help with picking out a water pump. I'm building a 600/600ish 496 stroker. I'm purchasing the last parts and I'm wondering if I need to buy an aftermarket water pump. The current engine is a big block that had not had overheating issues since installing an electric fan. Not opposed to spending the extra money if necessary but will use the new factory pump if it will work.