Mine dopes not have the water sensor, never had as as far as I am aware. You have access to a Nanocom now? I know a man who knows a man, but he likes to go fishing.
The lack of power up hill is how mine problem started I narrowed it down to injectors or HP fuel pump. It was the HP fuel pump. I bought a fuel pressure tester.

