Sonoff MINI-ZB2GS detatch mode state sync

TLDR version: is it possible to have input ON and OFF events rather than a toggle event from the MINI-ZB2GS when its running in detach mode?

Full version:
I have a MINI-ZB2GS which I am using to control an extractor fan based on the state of the WC lights and the temperature in a cupboard which houses a tumble dryer. This is connected to HA by Z2M

I have created a generic thermostat based on the temperature and this then sets the state of a template switch.

The MINI-ZB2GS is running in detach mode with the WC lights PIR connected to the L1 input and fan connected to the L1 output. I then have an automation that toggles the state of a template switch when the toggle event is received on the input state changing.

I then have a switch group which is the OR of the two template switches and this is used to control the fan.

This works fantastically, the only nagging doubt i have in my mind is using the toggle event from the MINI-ZB2GS switch input to toggle an output.

Ideally i would get an ON and OFF event from the MINI-ZB2GS so i know the actual state of the input which would reduce the chance of things getting out of sync.

Does anyone know if this is possible or if there are any workarounds?