my goal is around 300 whp..d16y7 should I stick with the stock water pump or look into the b series pump or are my hp goals fine for d series pump? oil pump should I port and shim or again my hp goals fine for stock? thanks