Don't turn off light, if not turned on by motion detection

I am just coming to Home Assistant, and have encountered this problem.

Is the entity controller integration now the best way to tackle this? Or is it better to save the switch context and use it in later automations ? (I gather from reading these forums that using boolean helpers is the least preferred option).

@tom_l are you using the entity controller now, or continue to use context?

Thanks