Help! Hue Dimmer Switch: Control One Light

So clearly this has been asked before, but there honestly hasn’t been a complete answer, only hints.

I have two go lamps, one on each night stand. I have two dimmer switches. Both control both lamps because they force a dimmer to be by room and not by light, which is kind of nutty of Philips.

The advice I’ve seen is:

1. Create a new room for each lamp. >> this is just silly and breaks the HomeKit logic badly just to be able to control a lamp.

2. Create a scene for each lamp. >> this means your scene, since again it’s all of nothing with Philips, will need to explicitly say Lamp 1 on and Lamp 2 off. So....guess what happens when you’re laying by Lamp one and someone gets in on the other side and switches lamp 2 on? It turns yours offs. Again, not a real solution.

3. Use the iConnectHue app. >> bought it, love it. But as far as I can tell, it can’t restore to last state (the default function normally when ON button is pressed on a hue switch). You can tell the app that button ON turns on a specific light, which is great, but then you can’t give it functions like color changing because those require scenes which loop you back into the issue in solution 2.

4. Get the lutron connected bulb remote. >> I love lutron and have many switches and pedestals. These would fit in so nicely but you use the color change and scenes-by-button cycle.

Is there really no way to have the dimmer switch do everything is normally does, but directed at one light in one room?