Need a ZHA quirk for Aqara E1 wall switch

Any one have this device properly working in ZHA ?

Its usable without a quirk, but shows up as a light with three entities (even though I only have the single gang version), and I believe it also has power monitoring.

I’ve managed to change the device domain from a light to a switch using the ZHA configuration using the instructions here:

I’ve also hidden the other unusable light entities, but it would still be nice to have this device properly supported.