I am not sure if this helps but I created an automation to control the HA with the original entities.
#########################################################################################
automation mqtt_command_switch:
alias: mqtt_command_switch
trigger:
- platform: mqtt
topic: 'homeassistant/switch/#'
- platform: mqtt
topic: 'homeassistant/light/#'
condition:
condition: template
value_template: "{{ trigger.topic.split('/')[3] == 'set' }}"
action:
- service_template: "{{ trigger.topic.split('/')[1] }}.turn_{{trigger.payload | lower }}"
data_template:
entity_id: "{{ trigger.topic.split('/')[1] }}.{{ trigger.topic.split('/')[2] }}"
```