Finally at a stage where I am happy with the install. At first I had issues with devices and realised that there were resistors on the devices. Once the resistors were removed everything worked perfectly in Home Assistant.
I bought the little switches for each board mostly for better reach from the supplied splitter cable. I ended up grabbing some of the magnetic PCB standoffs as well.
I've attached a picture of the old system too.