Add a cast bar on Heavy Shot, add a short cast bar on straight shot, Heavy Shot procs = instant Straight shot.
Buff the dmg done by these two attacks by ~3-5%. and change literally nothing else. And you will have resolved all of bards issues. Give them a penalty to constantly move, but let them scale better. Win win.