Done and done. That hasn't helped unfortunately. Multiple Z-Wave repairs, and waiting, in addition to adding more Z-Wave Plus repeaters verified to be beaming, has not improved the situation by any measurable degree.
Details on all I've tried can be found here and here.