I’m one who had Z-wave mesh issues when I had 90% Z-wave devices (all Z-wave Plus mains powered).
Life got better when I swapped out a few Z-wave devices for Zigbee.
There’s no real reason, IMO, to put all your eggs in one basket. Mix brands up. That way you won’t relive your current issue if there’s a flaw in one brand.
I’ve mostly got Zooz ZEN27 and ZEN26 dimmers and switches. But also have half a dozen Levitons and several GE/Jasco. I try not to mix brands in a single multi-gang box only so that the LEDs all look the same. 