I have service rifle for CMP/NRA matches, so I have a .22 service rifle clone.
My wife and I shoot in outlaw PCC matches at our club so we both have 9mm PCC and .22 PCC clones.
Personally, given the info you have provided, I’d build a 16" 9mm and a 16" .22. Down the road if you want different barrel lengths, it is a simple proposition to change.
Are any of your rifles FSB M4orgeries? I think everyone ought to own at least one. My favorite is a 16-inch mid-length, I also have pin and weld SOCOM, which I like a lot but, surprisingly, it doesn’t shoot as good my mid-length.
There are a lot of fun and useful possibilities out there, depending on what you want to do.