As you already know, several of your products are cloud based. So, you'll still be outside of that LAN until you transition out of them. Hubitat will be a nice fit for you since you already have SmartThings. You can even link Hubitat to your SmartThings to use devices. SmartThings stores the last state of each device in their cloud. Hubitat stores the last state on the hub. So, as you transition to more LAN based products, this will become more evident. WiFi is great for a lot of locally managed devices. You can turn any switch or outlet in your house smart with Shelly Relays. You don't want WiFi for battery based devíces. It uses too much power and kills off the battery quickly. It also requires much larger devices due to the required battery sizes. So, my rule of thumb is if it can be directly powered, WiFi is great. If it needs batteries, go Zigbee or Z-Wave. You have Orbi which is great because that is one of the few routers that actually allows you to make multiple SSID's for network segmentation. I think Hubitat will be a great next step for you. If you're feeling froggy, the ultimate hub is Home Assistant. That requires additional equipment though (dongles) and familiarity with VM's or Docker.