Basic attacks skills should swap to the current weapon you are using

Title; Basic attack skills should interchange based on what weapon you have swapped to. It is very clunky & awkward to play around with as I'm leveling my warrior since I have to dedicate an additional skill slot just to use another weapon's basic attack, which just takes up space for skills I actually want to use. The same thing applies to other inherents like raise shield and the like.