Looks like you are making progress and have some systems in place !shelving and storage boxes are certainly your best friend when you are organising a work shop. Your joystick box looks similar to mine 😂
Its sometimes hard to know what to keep and what to let go of , I have tons of boards , buttons and control panels that perhaps it is time to be ruthless with and move on.