Complementary 21700 EDC for incoming nitecore hc35

sorry for cryptic title: here’s the story

so I was looking for a headlamp and had narrowed it down to 18650, either the zebra 600 or armytek wizard pro nichia variant. Well that plan blew up last night when browsing “that auction site” where I was able to use a $25 credit and scored the Nitecore HC35 with 2 extra cells and a decent charger, the nitecore UMS2, for a great price. The HC35 is a little more light than I needed, a bit heavy, and of course less than ideal tint, but it’s a done deal and honestly should work out great as a work light, plus I got 3 cells and a charger (that I really wanted/needed). So I have 2 questions:
I’d like a complementary small format 1x21700 light to put those other cells to use; would like it budget friendly, and the Convoy S21A seems to fill the bill. BUT I don’t know if the Nitecore cells will fit (model is NL2140HP) since Convoy warns against non-OEM cells being fat with extra wrap/protection. Will they fit the Convoy (or any other tube)?

part 2: suggestions of a budget light that can use these cells? I’d like to keep it $30 or less, but could go higher if necessary.

Worst case I guess I could flip the hc35 and keep the charger, so feel free to comment on that. thank in advance

The Sofirn IF25A might also work for you - https://www.sofirnlight.com/21700-flashlights-c0374

from the Convoy store: the Nitecore battery is too long. oh well.

so now the question (I guess) is whether any 21700 torch will use protected cells. Any mods/builds to suggest?

so. doing my own research, Fenix models seem to use protected cells and just confirmed that Thrunite T2 can work too, according to their customer service (battery tube Length 76.5/diameter 21.6mm). both are more than my original budget but at least thrunite has a warmer tint available

Sofirn c8f maybe?