Water pump replacement

That's a great idea. Which reminds me. Take your time getting the bolts out. Use PB Blaster. I would start using it a couple of days early and apply it regularly. Those darn things going into the water jacket can be a PITA.
This is my biggest concern too, i pray that one doesn't break when i'm trying too remove it.