Cannot use weapon swap with Raise Shield

It is currently impossible to properly use the raise shield ability while having two: 1weapon+1shield setup.

Instead of having a single 'raise shield' skill, there are two. Each one cannot be assigned to 'weapon set' like other skills.
Meaning that when you swap weapons to be able to use skills with your alternative setup (both weapons ticked on the skills), as soon as you you 'raise shield' it swaps back to the primary setup since the 'raise shield' skill that you added a shortcut to is tied to that specific shield. You're now unwillingly using the primary setup again, you then have to manually swap again.

You cannot socket supports in raise shield, therefore it's useless to have two different skills for it.