Couldn’t agree more. I have long argued that this should be limited to machine-guns only. I personally limit myself to this in my campaign, and it works well.
Though TBH, snipers can still take out a Scylla in a Citadel in 2 or 3 turns without ever being threatened by it, even without RB. If you want to fix that, it’s much more fundamental than the RB problem.