New patch seems to have Quick Hands lower the costs of switching to 2 AP, rather than make it free. Have you tried it out with your build? I don’t use it, so I’m curious if this adressess your concerns. :)
Rally the Troops also recovers waaaayy less fatigue. I might have to be slightly less trigger-happy now.