Update: Shortly after this post I looked at a new oil pump shaft at the auto parts store and found the shaft has a internal snap ring that is supposed to let the shaft just pull out, mine would not budge. I spent the $2 and bought a new one, I had the car running nice and smooth within 15 min...