Yeah, don’t think your suggested SA1 is too broken. Since it’s either fighter, maybe make it 2nd hit instead so you can’t trigger it with Theonite beam.
It’s not too hard to charge up BB2, especially if you go with combo playstyle rather than spamming beams. If that’s of concern, can always...