Unusual Issue/Request for Meta Gem Weapon Set Assignment

So, brief background: I currently have a Stormweaver using both Cold and Fire skills, who has a separate staff for each element. The Cold staff is the main thing, and has tons of benefits for cold spells.

I am also using Elemental Invocation, linked to Comet. Comet benefits from the cold staff, but gets nothing from the fire staff. I discovered, when looking into Elemental Invocation, that you can set the individual gems within Elemental Invocation to different skill sets. "Great!", says I. "I'll set Comet to my Ice staff, so when I trigger the Invocation it'll ensure it's on the Ice staff so I get my, like...double base damage from Comet."

Problem: setting "Comet" to weapon set 1 (ice set) has the effect of disabling Elemental Invocation altogether if no other skill within the invocation is set to Set 2 (fire set). Rather than ensuring Elemental Invocation switches to my ice staff before triggering Comet, it simply turns off altogether if I ever switch to my Fire staff, voiding all its accumulated energy in the process.

This is super not ideal.

Would it be possible to change the behavior of Elemental Invocation, and possibly the other Invocations, such that setting a specific weapon set for an individual gem within the set switches to that weapon within the Invocation? if I want Elemental Invocation to only be active with a specific weapon set, I will set the Invocation itself to that weapon set. My desire is for the Invocation to be active at all times, but for Comet to force a switch to the Ice staff before triggering.