I'd buy another Fenix, in fact I probably will at some point. I'm saving up to get a small Surefire - mostly just for comparison. Something along the lines of one of the variants of P2X or P3X. But those are $165 to $250 for 500 to 1000 lumens. Comparable lights from Fenix might be a TK-15 (400 lumens, $75), or TK-09 (450 lumens, $60), or a PD35 (960 lumens, $70). All roughly the same form-factor. Having had a couple of Fenix's I kind of want to see if the Surefires are worth the 2x+ price tag.
I don’t know why you don’t just send in the 7 year old TK-10 from the old days, and have them repair or replace it.
I also don’t know why you would waste money on a Surefire instead of buying another Fenix, a Surefire which most flashlight people now think of as being overpriced and slow to improve.
I EDC an LD01 and a PD35.