Well, I removed the code producing the log message about swapping endpoints (ZWaveMultiInstanceCommandClass:454-465), and now it works! 
I’m sure it was added for a reason :p, but Git history is lost with the repository switch.
Let me know if I can do anything else to help determining the right way to do this.