The next step was to finish off the diodes on their fly leads, covering the exposed leads with plenty of heatshrink.
I’m not at all convinced this is the best solution, but I’ve not come up with any better ideas where the prefab PCB is being used. Ideally I’d prefer to have the diodes fixed in position, much closer to the board.