That is a good starting list.
It is going to kind of depend on what you want as you are kind of looking at two separate areas. Nootropics may help with the lack of stims (or allow lower doses) but that won't always mean performance while some adaptogens and herbs may help with performance but not give you energy in the sense of stimulation.
That said...
Nootropics:
For pre-workout especially:
1) A Choline source (I think the Alpha-GPC thought here is great especially if looking at the possible performance boosting data, Citicoline is awesome for focus so it is worth trying both to see how you respond).
2) Tyrosine for limiting the depletion of Adrenaline and Dopamine during stress (like exercise).
3) I like ALCAR here as well.
1-2g Tyrosine + 300-600mg Alpha-GPC + 500-1000mg ALCAR is something I love either in combination with a little caffeine or none if you really want to go stim free. Toss some Dynamine and/or Teacrine in with a lower Caffeine amount can also help you "get away" with more bang for your buck for stimulation without a big Caffeine intake.
4) Potentially phosphatidylserine
for exercice capacity and mental boost.
Adaptogens:
1) Rhodiola is an awesome and possibly my first choice for Adaptogens in regards to performance in a pre-workout setting. Make sure it is standardized and possibly look preferentially for Salidroside content if dosing pre-workout. Keep in mind more isn't always better with Rhodiola (it works on a u-shape curve so too much is detrimental), but 3-5mg of Salidrosides is a good starting point for pre-workout.
2) If you are already taking Ash that is awesome possibly look into Arjuna too if you do decent cardio or want more cardio benefits as
this study showed solid benefits to both or each in isolation.
3) Eleutherococcus senticosus aka Siberian ginseng is a personal favorite for performance during stressful times, although not necessarily needed to be taken pre-workout.
4) Mushrooms. Kind of a broad category and some also work as Nootropics (Lions Mane in particular for cognitive and anti-inflammatory benefits). Cordyceps in particular for actual training performance. PeakO2 is one of my absolute favorite ingredients for performance.
Ok so I could probably list more and hopefully that isn't too much to read, but can maybe get you started and get you thinking!