Find the 2AA body for your L2T.
Seriously though a 2AA light can match only a 1*CR123A light in output and is almost twice as long. There was a reason you modified your L2T.
Short 2AA
4sevens Quark MiNi AA² (currently out of stock)
This is the shortest 2AA I know of. Twist on off.
Goes Lo Mid Hi. Fenix tend to go Mid Lo Hi.
1AA
Most 1AA top out at 90-100 lumens which is less than what you are used to.
Nitecore and Zebralight have some brighter ones but I don't own any so can't comment.
Xeno E03 is also supposed to be bright but I have been reading about switch failures lately.
RCR123A
Some 1*CR123A lights are compatible with RCR123A. Others are not.
Most Fenix CR123A are not. Quark MiNis are not but the full size Quarks are.
You can get a Quark 123 with clip or no clip.
Problem with the Quark Regular is on head loose it goes moonlight low medium high. The 3rd mode is my most used indoor mode. Very annoying click click-click click-click.
I got a Quark X neutral AA² Tactical with a 1AA body. This allows me to program my 2 favourite modes for head tight/head loose positions. With 1AA the Max is not at full brightness but still very bright. (My 14500 arrived today, charging now so I can get full brightness back with the short 1AA body.)
My suggestions:
Either
Quark 123 Tactical (no clip) or Quark 123 Tactical for EDC and the Quark 123² Turbo for your bigger light plus RCR123As and charger.
OR
Quark AA² Turbo and Quark AA Tactical
OR
Quark AA² Tactical with a 1AA body.