Surely the Gun swap should be only be available after your team mate has bled out, on a few occasions I have gone to revive someone in the heat of battle, only to swap to the weapon he was armed with, wouldn't it make more sense for this to happen after a bleed out
A lot of people, myself uncluded, like to hold square to ensure the animation starts but this is exactly what's causing thr gun swap.
It will take a little bit but I advise you to learn where the promt shows up and just tap the button - your biggest issue will now be reloading your weapon but that is quicker to fix.
If all else fails you can even remap your controller; I was planning on using triangle/Y for revives
Yeah to swap guns you hold the button, for the revive just press the button. You can also cancel the revive by pressing the button again in case you start getting shot
