If you have no rules etc. tied to the device yet, I would delete all the devices, don't delete the Device Types you have installed, and re-pair the light switch.
Now set the options, one button or two buttons and save.
Now press create child devices and all should be good. (Hopefully).
I'm pretty sure this is what I had to do as I think I ended up in the same situation.