It still seems to me like the gear on the starter drive is hanging up on the ring gear. Maybe pull the starter and look at the teeth on both the ring gear and the starter drive and see if it looks like its been binding up. You could also take the solenoid off the starter and install it, then you can engage the starter drive into the ring gear and see if its hanging up.
