That would do it.
I'm not a Mobil fan boy. That's just me.
If you are going to buy bulk T-6 for the shop, check with your Shell Distributor and see what you can get in QSUD for the cars... As good as M-1 and it'll all bill through the shop account.
I always run my 2-strokes a tad heavy on oil. My moto is that no 2-stroke ever died from too much oil - ever. I used to work on outboards that tried 50:1 and 100:1 - that's why I worked on them.
Now I advise and counsel a bunch of tree guys who have fleets of stuff like you do, and we build saws for fun. They all get Motul-710 at 40:1. That's not cost effective for you, but maybe something similar ...
I've also had good luck with Poulan Synthetic 2-stroke (bulk) and Supertech TWC-3 50/50 at 40:1 for stock motors. Seems to keep rings free, not too much combustion chamber build-up after hundreds of hours operation.
BTW - the oldest saw we have is a Mercury powered Disston straddle-chain saw that was logging in the valley in the 1940's. We have many 1950's saws in the collection. The real old stuff runs 32:1 on modern oil. The 1960's to today's strato-charged all get 40:1
I feel for your task of keeping it all straight ... Just the filter inventory is nuts