I have been through a similar process before, lots of moving and deleting, but then I realized that the best is to use LESS, own LESS, even in the digital world, e.g. photos.

Now I am at the stage where I don't use the Apple ID on my laptop anymore, and I erase it from time to time. It took me about 5 minutes to get everything back on track.

Thanks for the other tools you share; gonna have a try with some of them.