The block is out of the shop now and I bought a Spoon oil pan that was on sale at a local shop. I finally found part of the reason why the oil pump broke, here is a picture of the old oil pickup vs the new one(also, same part# but new one has larger squares for the oil to pass through):