Weird, I did this whole thing the beginning of this year and I still don't remember taking out or putting in a bolt by the oil pump pulley

I even had one of my bolts break off into the block and I figure i'll deal with that when time comes to pull the engine. Right now, it's doing fine and not a single leak.
Take the three bolts off the thermostat housing, remove that, then take out the 4(?) bolts where the temp gauge sensor and motronic ecu temp sensor are and remove that center piece. Then be very careful in taking off the waterpump bolts. I would use some sort of spray like liquid wrench to possible loosen up any stubborn bolts and spray that every few hours for a day or so. Then the next day, gently remove those. They will probably be rusty, so replace them if you can find a shop that specializes in odd sized bolts. Also, think about replacing the three long ones if they're in bad shape (also VERY hard to find and expensive).
Make sure to replace all of those gaskets. Since HOT coolant flows around them, they will break apart and leak if you use them again. So, make sure you get all those off before putthing the fresh gaskets in. You should need a total of about 3 or 4 gaskets to replace. I used this gasket sealer as well to prevent any leaking, though I will probably regret that when time comes to do it again. Also, I recommend replacing all of the hoses that are around that area AND a trick i used on getting them back on easily was taking my finger and putting some concentrated soap in or on the area it would have to slide onto/into, and it went in SOO much easier!! If you think your hoses are okay, I'd recommend you replace the two short hoses that go into the block.
Michael - you made it sound like you replaced the water pump without taking the timing belt off??? Or were you just talking about the oil pump pulley?
I hope my experiences will help you!!