OK… I spent some serious time on this. It may have actually been more difficult than simply darkening the yellow, but in the end it looks correct. There was a lot of strange masking I had to figure out.
It works in Night mode, but since the night mode ignores the Top Layer if it is in Add blending mode, I had to lower the opacity to 3%.
Coloring the device works as expected. I had to mirror the Device HSV parameters to the Top layer.
I think I am happy.