The problem is in the receiver and so IMO that's what needs addressing first. One solution that occurred to me would be to convert to rimfire as you suggest, and then to mark the under-wood surface of the receiver to indicate that it's been broken and welded back. In order for any future owner to convert back to CF, he would of necessity have to partially disassemble the rifle, thereby exposing the cautionary message. This would preserve the present attractive external appearance while providing enough info to prevent any future FUBARs.
Plus on a personal level, IMO the 22LR is far more useful and enjoyable than the 25-20 in an actual using-type rifle.
Regards, Joe