You need to remove the timing belt to change the water pump, iirc.
I believe the tensioner gets in the way of the water pump bolts, thus you have to remove the t-belt, basically.
New water pump is like $30 or less. I have at least 3 fans in stock (haha) and other parts, so if you need, etc.
If you're not super comfortable with the work, I can do a full pictured how-to, seeing as I have all the necessary pics, I just haven't gotten around to doing it. If you follow the FSM (download on here in the General Tech section's stickies) it is fairly straightforward, you already have quite a bit out of the way. I do recommend an impact on that 22mm crank bolt to get it loose btw, its not impossible otherwise, but makes life easier.
I've not found a fix for the hood pop-up issue, on cars I've had with the problem, a bungee cord of sufficient length so I can pull it up a bit while grabbing the release has usually worked.
GL with the build and keep us updated with pics!