ZHA and Aqara H1 Double rocker switch With Wrong Quirk

I’m fairly new to this, but this is driving me mad and I’m pulling my hair out, please help.

I have an Aqara double rocker wireless switch, that I could add via ZHA but without any functions working properly. Which has been a documented problem in the past. After reading several threads here I’ve narrowed it down to it having the wrong quirk assigned. So I installed the correct custom quirk via file editor and re-added my switch. However is just keep assigning the exact same settings to the device, changing its name and even connecting up an automation I had applied to it.

I’ve tried deleting

  • Deleting zigbee.db file
  • Factory resetting the switch
  • Using terminal to delete zha.storage file in .storage

But I can’t clear the ZHA chache, so when ever I re add the switch it applies the old name, area and adds the automations.

Any help?

I’m on the latest version of HA and everything is up to date