In the video is the same issue.
I think there is a way that work, but the work just for this is to much and make new problems.
You could pull all new models and switch the animation with is wrong in this case, with this one, which fit.
So then it look good there BUT on other mounts, it could look strange.
Another way would be to edit the model and make new grips^^