Oh yeah you do. The water pump or impellor is just under the cav plate above the prop, But hold out on the water pump for a while.
Sure it will need to be done but, but i'm not convinced it's a water pump problem at this stage.
Sit back and wait for some ideas, Chimo hows your theory on this, would your Mod work.