That bottom cover is a damn pain. You almost have to remove the CAM gears just to get off. Yes do replace the water pump and most importantly the seal.

BTW I love your timing cam gear holder, very inventive!