Upgrading from z-wave to thread... current best advice?

The best I can come up with is: Incorporating Matter - IMHO this is not going to happen anytime soon …