I'm sure others will get what you are describing, with me not using Z-Wave.... but what is the actual issue, i.e. where were you seeing an error, something not happening, etc? Is it the grey devices?
Still... could be of some use, if it prompted you to post the topic...? Probably won't be of any use to me in helping, but others may take something from it...
If I'm not able to interpret what you have posted, don't make that change your approach, I don't use Z-Wave, so likely something I am missing or not aware of.... I'll leave it to others to offer assistance, likely more useful than what I can offer.