Update Xiaomi Aqara services to be called by it's entity ID rather than mac address

Currently (v0.113.3), the services tab for the xiaomi_aqara service requires entering the gw_mac of the device. While this isn’t complicated, I’m sure no one has the mac of their gateway memorized. Recently I installed openzwave and was pleasantly surprised that they have gone away from addressing the devices by their node # and instead address it by the entity ID.

So, in a similar fashion, can the xiaomi_aqara service be updated to use the entity_id of the gw, have it populate in the entity dropdown like many other services already do?

Current xiaomi_aqara service and open zwave: