Warrior 3s uses an sst70 led with a head diameter < 26mm (source: Olight Warrior 3S Review – Phenomenal EDC/Tactical Hybrid – Grizzly's Reviews) and the ps36r seems use sft40 with a small diameter as well. Since you asked for a spot light, my understanding is that either a reflector-based light with a bigger head diameter or a more focused TIR-based light might serve you well.
Putting aside the 12v requirement for the moment, this thread has lots of recommendations for “thrower” lights (I’m treating this as a synonym of “spot” light). For a “toy” Wurkkos TS30s ($77) uses a very powerful LED but can’t sustain for long because it doesn’t have as good a driver as the lights you own. It also has a much bigger head to concentrate the light in the center.
Another unregulated option is Sofirn IF22 ($35) which may produce more of the “spot” you’re looking for due to the TIR optic which produces a different style of beam that’s even more concentrated, using the same LED as your Fenix.
If you DO like a better driver (EDIT: maybe not, see response!), then the Thrunite Catapult Pro ($89) might be worth checking tool.