Ouch that existing setup is definitely being hindered by it's orientation. Suprisingly the tilt only has a small effect on the total output (unless they are flat of course). When I was designing my system I crunched so many numbers trying to decide if I should angle them differently, adjust them seasonally, or even try out a tracking system. Sadly none of it pays off. For a roof mounted system, adjusting them for a better angle or tilting them seasonally requires quite a bit of spacing between the panels which means you can't fit nearly as many on the roof. I have 15 panels on my roof and if I spaced mine far enough apart so they didn't cast shadows on each other and adjusted them for the best angle (either year round or seasonally) I would have only been able to fit 10 panels on my roof. Seasonal adjustments (4 times/year) only increased production by 4.6%, which would net me an effective 2.27kW system once all the math is done vs my current sytem which is effectively 3.2kW. It's nice to squeeze every bit of juice out of the panels, but it only makes sense if you have the extra space, otherwise you're just better off just packing as many panels in as you can fit.
As far as tracking systems go... Those things are awesome, BUT they add a lot of cost (if you can't DIY one) and a lot of complexity and maintenance to the system. If you want a set it and forget it type if array, it's not recommended. They increase solar production by 28.9% which is impressive, but again space is a concern along with the terrible (to some) aesthetic of them, although I think they're a thing if beauty.
If you're interested in crunching numbers for your shop solar array, here's a good LINK
https://www.solarpaneltilt.com. It already seems like you're on the right track for a pretty optimised setup though.