Help Me Plan Out the New & Improved Shop

Two things come to mind right away.

Make the building tall enough for a lift. Even if you don't put a lift in, at least you COULD.

No shelves - cabinets. Shelves collect dirt and dust, cabinets do not.