Since we had gone this far, it wasn't a far cry to address the oil pump. When we drove the car, it seemed ok, but we were already replacing the oil pan gasket. So we decided to put in a new oil pump (GM PN 1255884) from Summit Racing. If you have a chance, no matter what engine you are working on, you should try to get one of these Fel-Pro oil pan gaskets. They feature a solid core coated with rubber or silicone with anti-stick properties. They won't crush, and they will usually come off when you need to drop your oil pan again.