A quick follow-up…
As I mentioned here, I’ve started to migrate my production system (RPi + HAOS) 
NUC + Containers. The first container I committed to moving over was Z-Wave JS UI, so I needed to go through some backups and restores anyways. That went fairly well once I found this video (I intend to update the Z-Wave JS UI GitHub to add some migration documentation).
Anyways, once I got Z-Wave JS UI and my Z-Wave back up and stable, I turned my attention to the integration. I first tried to re-config the ws://a0d7…-zwavejs2mqtt:3000 controller with the updated external server URL. It gave me some error about a USB mismatch, so I just deleted it. Then I tried updating the ws://172…:3000 controller and it took it right away and after ~10 seconds the integration updated to include all of the Z-Wave entities in one entry.