@Benhm3 Z-Wave is also an Open standard and with the new ZWA-2 there is a new open source peace of hardware made for #HomeAssistant. So, do you really need to change anything at your configuration?
I think it is a good idea to use Matter over Thread and Z-Wave too, like placing your bets on two horses.