Sounds like you would probably like the EdgeSwitch line of products better than Unifi. Cheaper, faster, and easier to manage if you are trying to do something specific.
I was thinking about trying EnGenius or even Cisco next, but I'd like to stay within the Unifi universe because of my investment in wifi access points and video cameras. I should definitely investigate the edgeswitch line! I sort of ignored them thinking that they were last generation, but I'm going to take a look.
If you're interested in spending a bunch of money buying stuff again, wifi 6e APs are trickling out from the usual vendors. If your local spectrum is congested, the new 6ghz band might be nice.