Sounds like an excellent opportunity to migrate to mandrel bent stainless, in the stock sizing.
I've been considering eliminating my front cats, is that something that might be feasible, or do you have outstanding factors that would make that inadvisable?