Yeah that sucks and is frustrating.. One thing I've done is offload all my rules etc to Node-RED. Keeps things as simple as possible on my hubs.
You could do some zniffing ..
edit: In the past I've used multiple he hubs by location which worked really well. Currently am running C-7 for Z-wave, a C-5 for Zigbee and a C-5 for net/cloud apps.
