It's a good either/or compromise. IF they want to stay with it as a kit, then they need to treat it as a kit proper and flow and/or the charges need to not decay until used.
OR if they are open to dropping it as a bundle (pun not intended), then having F1 be the core burst outside of Gunsaber and Dragon Slash while in Gunsaber would work. The GM traits could then change Dragon Slash into Force, Boost, or Reach. F2 could be Triggerguard and F3 could be Flickerstep regardless of whether you have Gunsaber out. F1 would consume Adrenaline like it normally does, F2 and F3 would not. The tradeo