Well,... I ordered the extractor/ejector kit from Sharp Shooter Supply and it appears to have solved my ejection issues. The kit came with a redesigned ejector and new ejector spring and a new redesigned extractor and a new extractor ball and it utilized the OEM extractor spring. This appeared to be $24 well spent.