Mounting options of Supernova M99 Pro

[tbar23]

Hey everyone - it has been a good first few weeks with my ST2S. I logged two round-trip commutes and am definitely glad I went with this bike. I have used as much as 530 Wh for one-way, and I'm quite confident the mid-drive bikes I was looking at would not have enabled the speeds I've been managing (just under 25 mph average for the 21 - 22 mile commute).
I purchased a slightly longer stem with a large negative angle in an attempt to get a more aggressive / aerodynamic position. I managed to get the under-stem wire management tray to fit nicely, but I completely forgot about the M99 Pro light mount. Unfortunately, the Stromer M99 light mount stem piece doesn't fit the new stem that I bought.
Has anyone put a new stem on an ST2 or ST2S, and if so, how did you work out the light mount?

 

[tbar23]

Found some options that would probably work with lots of different stems:
Ritchey Universal Stem Mount
This piece is kind of cool because it appears to allow adjustment of light pitch, but also has an ability to adjust to stem mount bolt spacing (8.4 to 28.1 mm). The primary downside is that between the mount configuration and the angle of the stem I have purchased, the light would be significantly lower than its current mount point.
And Supernova makes this thing:
Supernova Universal HBM
Probably a better solution (though 2x the price and more difficult to buy in the US

Thought I would post for future searches.

 

[Ravi Kempaiah]

And Supernova makes this thing:
Supernova Universal HBM
Probably a better solution (though 2x the price and more difficult to buy in the US

We have a few spares that I can let go of.
If you could wait, I can ship them end of the month.

 

[tbar23]

We have a few spares that I can let go of.
If you could wait, I can ship them end of the month.

That would be great, thanks @Ravi Kempaiah. Should I just reach out to you in a week or so?