I've been planning on replacing numerous plastic hoses and pipes in my 2010 XK 5.0. They consist of the front crossover outlet/AJ89664 rear heater outlet flange/AJ814007 Thermostat Housing/C2Z19929 as well as the upgraded smaller hoses (that re route the coolant for the water pump) C2Z28467 and AJ813565 I had the most recent updated water pump installed over a year ago by Jaguar. They DID NOT use the upgraded smaller hoses I have mentioned although I complained about that. My question is this. One particular tech (who worked for Jaguar for a number of years) mentioned that in order to install the upgraded hoses mentioned, it required changing the water pump due to limited space for making the connections. I've read about this on another thread, and I'm sure it's way easier to connect these hoses when the pump is out. I understand these fittings are the push and seal type and can easily be damaged. The tech is emphasizing the possibility of not getting a proper seal and thus risking coolant leakage after spending many hours installing all the plastic parts. Does anyone have any experience installing these upgraded hoses and tubes (C2Z28467 and AJ813565) with the newer routing, to an existing water pump? Any issues or problems? Thanks all.

PS. I was willing to avoid replacing these upgraded hoses altogether, but was told that even if I try replacing the front crossover and thermostat, the older hoses (that these two parts replace) will be disturbed and might also cause coolant leaks due to age and possibly being brittle. My car currently has 14,000 miles.