If you have to do the water pump yourself, I totally recommend getting the Snap-On FLXM13 wobble extension 12-pt socket. Although it didn't let me skip a bunch of steps like some other users, it did make getting at the water pump bolts a LOT easier. It's described as a "GM Distributor wrench" or something, but you'd think it was specifically made for these water pumps by the way it works.