the water pump does not look too hard to do.

Famous last words. Took me all day & a friend. It's a tight area to work in. Just have to ask yourself... if you could do it in 4 hours + the cost of the pump, and it doesn't work, will you be upset if you put that time & money it?

Up to you...