Separate bossing and mapping skills

I would like to see a feature kind of like the following. I want to be able to use the control button as a toggle, not a hold down, to swap between bossing and mapping skill sets. For example, I would like my lightning spear skill gem to have electrocute on it when I am in mapping and a shock gem on it when I am bossing. Ideally the association between weapon sets would still be different for different skills depending on whether you are in bossing or mapping mode, but obviously there's some complexity there that general players might not grasp.

A simplified version is, I want separate supports for bossing and mapping without having to have copies of the same gem socketed.

+1

In PoE1, gem swapping for single target was easier, because they're attached to your gear so you don't need to open up two separate menus like what you have to do now.