I have both types, I vastly prefer the bolt locker safeties. I'd gladly swap for a locker. I looked into what it would take to make a non-locker into a locker, its more than its worth I guess, if you can get the old parts, and someone reasonble to make the cuts.
What value is a Mauser extracor in a push feed? They are excellent extractors. They snap over the rims just fine, as 1903 Springfields have done since day one. I doesnt really matter to me how they feed. Controlled round feed is not mechanically more reliable, it's more reliable when the operator screws up and short strokes it. Run your gun very positively, and dont short stroke it. Run the bolt like you mean it, at all times, pick up the brass when you're done shooting, even your prized, gold plated family heirloom brass at the range. I made it a habit to never think about brass until I was done, if I lose some, so what. Develop good habits and you wont have a problem. "Slamming" the bolt in its operation may be an exageration, but not by much. I give it no mercy, and have never had a problem.
If somene wants to remove the bolt locking parts from an earlier gun, let me know. I'd be interested in them.