Help optimizing a Dual-Herald Spiral Volley Gemling Legionaire.

First off, huge thank you to Seeders#7506 and Mathil for the base builds that I pulled this from. I'm loooking to optimize their ideas for a Gemling Legionaire.

Seeder's build - https://www.pathofexile.com/forum/view-thread/3657298
Mathil's build - https://maxroll.gg/poe2/planner/c9rrz0vn

Current Equipment, Gems, and Passive tree here - https://mobalytics.gg/poe-2/profile/f796d8a6-bd0d-4853-81f0-53118044d483/builds/d9509545-0e35-4e7f-90f6-950111660bc8



Basics of the build are to use Combat Frenzy along with freeze and shock to generate frenzy charges, then spend those charges on 1) Map Clear using Spiral Volley, and 2) Bossing using Barrage>Stormcaller Arrow. We use Blueflame Bracers to convert flat added fire damage from bow, quiver, and ring to cold damage, and Polcirkeln ring to shatter chilled enemies as though frozen. Build also uses the Herald of Thunder/Ice tech to generate shatter chains.

I'm currently 75 and working towards picking up the crit hit, crit damage, and accuracy node clusters. Moving through maps feels good, but I can't help but feel I'm missing on some good nearby clusters, specifically the 2-hand damage cluster near merc starter. I'm also wondering if my gem loadout is optimal compared to Seeder's and Mathil's, as those set up for Pathfinder and Acolyte of Cahyula, respectively.

I'm currently using Wind Dancer as a defensive layer, supported by Blind, Maim, and Pin, but I could get rid of it along with Clarity and vitality in favor of a Cast on Freeze or Shock set up, or Elemental Invocation.

I favor the 2-3 button setup I'm currently using, but I do have a single open gem slot, which I could fill with another bow skill, a curse, or a mark, if they would help bossing significantly.

Thanks for any and all advice!

Updated.