I have tomorrow sort of free, and thought I would offer a helping hand, til I realized you were 1,100 miles away!   Have a similar problem here, with new shop, old shop, barn, and storage building, plus a full basement.  Shelving sure helps.  I can see a difference.