I am also preparing the bike for a big trip. My X has done 50k km and never experienced any water pump failures.... I wanted to replace it as preventive maintenance. I know it's a big job. I was thinking of getting part #6 and part #5. Do I also need part #7 #8 #9 ? Any particular thing to keep in mind while doing the job? thanks!