It's a difficult one for me to give advice on as I have a vast collection like you (not as big I suspect lol) but vast to me. It's cluttered and all over the place and like you I want to get that resolved. Some years back I cleared out most of my systems I has doubles of and I felt relieved as did the wife lol.

Anyway whatever you decide needs to be right for you pal.
Oh and not wishing to jump on the ship before it sails. I would love chance at some of your Amiga gear.