Just to wrap my contributions to this thread up for anyone reading it who’s in the same situation… the experimental software fix from UI seems to have resolved the issue. I haven’t swapped the hardware (as the RMA stock in the UK wasn’t available until after the firmware shipped).
Personally, I wouldn’t go deploying this switch model until it’s evident the bug fix has become GA. But it does seem to be understood and likely to be fixed imminently.