I went for the floor plan approach. Overall this works well for me to do a quick visual check of the house, and to easily track down any given control. Though I need to clean up a few old entities.

Should be noted: I still try to automate as much as possible with room-specific presence detection, and still have functional physical switches for lights.