I've started cleaning the oil/grease from my detent bearings with carb cleaner and using Lock-Ease graphite spray on them. That seems to work pretty well and I think it reduces the chances of them gumming up and getting sticky/sticking. Teflon dry lube would probably work as well but haven't tried it yet.
I'd also try removing the spring behind your bolt and see if you prefer that. That's always working against the bolt staying in battery like was happening with yours. Less chance of the bolt accidentally getting pushed out of battery without the spring pushing back on the bolt carrier.
