May be replace ranger with cav rifle with adjustments? It was cavalry company after all.
Tbh if people are so horny to not have to repair their tank like everyone else that could work. I know bundles are gross but cav rifles with the repairing HT from campaign might do the deed.