Thermostat and Boiler Controller not reporting states correctly

Hi, I hope I’ve got this query in the right section.
I have a Secure SRT321 (also known as a HRT4-ZW) thermostat and a Secure SSR302 two channel boiler controller. The two devices talk directly so I have fall back if HA fails and both also connect to HA via z-wave. The configuration worked perfectly when the system was using the old Z-Wave but since swapping to z-wave JS HA no-longer reports the status of the SSR302 switches correctly (but you can change these via the dashboards) and it often isn’t reporting the change in the setpoint of the SRT321 thermostat despite it updating on the device itself. I realise it’s been some time since z-wave was dropped for z-wave JS but I was hoping it was one of those bugs that would be worked out but it appears it might have been missed.
Any help in how to solve the problem would be very gratefully received :slight_smile:
Tom