@Cjkeenan
I’m almost certain now that my issue has been some kind of interference and/or issue with the placement of my Zigbee stick. I was seeing issues with the Z2M map generation, seeing errors in the logs like “Failed to execute LQI for…”, where the device mentioned was a routing device like a Samsung Smart Plug. Once I moved the Zigbee stick away from the SSD and potentially the Aqara FP2, then the map generated as expected and devices started working more consistently. I have it plugged into a powered USB “hub”, but I suspect it needed to be located a little further away from some of the other stuff I have nearby.
Given this was intended to be my dev hub, while I got my head around the platform, I will likely setup my second hub in the lounge room at some stage and move everything over. So I might not worry about the position of the Zigbee dongle sitting on my desk, rather than being tucked away nicely in the cable management box.