Hi all,
After migrating from 1.x → 2.x of Z2M all my switches stopped working.
TL;DR - This blueprint resolves the issue
I used @nexusmaniac 's revised blueprint to start with, this got lights turning back on but I later found it triggered actions for all switches in my home. @Springeraner1’s crucial addition of a conditional resolved this in his blueprint template
Some supplementary information to help others get this setup. please ensure your switch is set to event for it’s Operation Mode in the Z2M UI view for your switch device. Setting the Operation Mode can only be done when the device is awake (press both buttons on the switch 5 times in quick succession, they will flash 3 times to notify you they are in the “awake” state for 60 seconds). If the switch is left in Command state for its operation mode, the switch will not work as intended for this blueprint (this is my experience anyway).
Another aspect that threw me off was the “action” of the switch is at the device level, it is not it’s own entity (like the battery, operation mode, etc.) so the device itself must be used as the blueprint trigger for Z2M>=2.x. This is the biggest change in behaviour I observed when upgrading to Z2M 2.x from 1.x
For any HA new comers, ensure you refresh your YAML config in “Developer Tools → YAML → All YAML Configurations” after updating the blueprint YAML to ensure it takes effect before modifying any automations you have using this blueprint.
Hope the above helps others coming here for a solution 
Thanks @nexusmaniac and @Springeraner1, ye saved me from a very unhappy wife/kids come night time with ye’re revised blueprints 
Dave.