I am on a 2000 DRZS and I want to buy a new water pump assembly. Mine is leaking, and I heard that the "new" design is better. Although the Fiche calls out 17400-29F00 for my 2000 model, should I get the 17400-29F10 as listed for the newer bikes? Will it bolt on? 17400-29F00 PUMP ASSY, WATER (MODEL K5) 17400-29F10 PUMP ASSY, WATER (MODEL K6/K7/K8/K9) Damn, I have to leave on a trip on Friday night and now I need to overnight the parts!