Have you guys considered using the open source radeon pro render instead of cycles?
It works on both gpu and cpu simultaneously, and is compatible with nvidia and amd cards.
Even more importantly it has per light AOV support, which basically means you could set all your lights to 10 for example, bake the scene once, and then tweak the brightness and colour of the individual lights in real-time, with no need to bake again (unless you move, add or remove lights).