After playing with this a little more, I think you might benefit by using ‘Capture state of attributes’ and ‘Restore state of attributes’. Before you do anything with a light you capture the state, say it’s level and switch state. Then someone walks into the scene and a light turns on. When that motion sensor turns off, then ‘Restore state of attributes’ to turn things back to the way they were. See if this helps.
Check out my piston that captures states and restores them:
Case Study - Buglight (Capture and Restore State)