Congrats on your lights and mods, feel free to post pics.
Glad you found a way to do the 250 click that works for your raised buttons. My approach, which also works with flush buttons, is to stand the light on a table while pressing the button.. Both my Spa and my Storm have 4500k N219b, my favorite High CRI LED.
Left to right, Pewter Spa with Black bezel, Gold Storm, HDS Rotary Cool White
I also like the stock LED beam, except the Low CRI, and Low Lumens. My Spa now makes overt 250 lumens, the storm only 110. In stock form, Novatac high modes vary a lot, I recently bought one that only made 70 lumens.
Besides the flicker on Low mode, my Spa also flickers at 3.6v and the Storm at 3.8v. I consider those to be undocumented Low Battery warnings, iow, a feature, not a bug... LOL
Other differences is that my Spa has a black bezel (and no locktite), the other Novas Ive had with aluminum bezels the color of the light, were locktited, like yours. There are at least 3 generations of SPA, each with different knurling. They all have the USA marked tailcap, though I have my doubts about where the bodies were made.
The cool thing about Novas is they have the HDS Clicky UI, which is very entertaining, plus the nice programming feature, once unlocked.
Merry Holidays