Weapon Swap issue with Auto Attack

On my Warrior, I am using a simple auto attack build and I have a weapon for bosses/rares and one for everything else.

I noticed that you cannot assign both weapons to the same auto attack button--whatever, minor annoyance, I will just make another hotkey for that one.

The thing that I realized is that even though it is the same skill, having another auto attack cannot have the same supports in.

The "Fix" that I see is to manually equip the weapon whenever I need it for those single target moments, however because of being on controller, this really isn't a good fix.

Basically, the question I have is: Is there a way to utilize the same auto attack with the same supports that will work with the weapon swap?

Thanks!