You are correct.
The only shift up the scale is with age... I got the mixed somehow.
Is the factory D8S?
I read somewhere that you can convert D8S into D3S or something... I think it was ST forum (or HIDplanet) they played with OEM HID system to get 35 W setup.