Honestly, if I didn't have the capacity to diy a solution, my next first choice would be filing the frame to clear the "8" style part.
I dont want to spend the kind of money they want for a replacement catch assembly, so I'm going to brew my own one way or another. And it may or may not be a viable, marketable solution.