Sounds like you have the bolt 22's covered pretty well already. I will agree with who ever mentioned a Marlin 39A though (a pre-safety avoids that annoying rebounding hammer thing).

I think you'd love a .357 lever gun to go with your .357 handguns. That will be my vote.