I wouldn't say that it is getting replaced with wifi. But z-wave is definitely getting replaced by Zigbee, 6LoWPAN and Thread. (all of which aren't compatible with z-wave's proprietary hardware.) Also the entrance of the long awaited Bluetooth mesh, will have interesting effects on the market.