I have been leaking water for atleast 2 weeks now and last night i figured out that it was coming from near the crank pulley so i suspect its the water pump but i searched and also found it could be some O ring? Anyway if it happens to actually be the water pump i guess i should go ahead and replace the timing belt, tensioner and the oil pump while im in there. Would it be better if i used the newer/vtec water and oil pumps? Also is there anything else i should replace while im in there?