I spent about 6 hours on Friday doing:

coolant flush
water pump
thermostat
air filter
fuel filter
oxygen sensor.

It would have been much faster (by ~2 hours) except I had trouble popping the old water pump out. A solid oak board used as a lever finally did the trick. The sucky thing is that I stripped the remaining threads out of one water pump bolt hole It had apparently been stripped before, just not all the way. There were about 3 turns left... now they're gone, too. Is re-tapping the only good way to fix this with the engine in the car? Or maybe use an insert kit? The pump is holding fine so far with no leaks (the tension on the belt actually puts pressure on the side of the housing where the bolt hole is stripped, so that's good). However, I'd like to secure it for peace of mind. Any advice would be appreciated, though at this point I'm leaning towards retapping with the next larger size.

-Winston