You might want to take a peek at https://github.com/openhab/openhab-core/pull/4995 to see whether this new feature (not yet merged) could make light handling easier/more consistent with how OH (in the future) handles the various types of bulbs/lights out there.
