weapon set issues

Hello.
There are currently a few issues with weapon sets as monk:

1) Barrier invocation and similiar skills function in a way that if I bind them to a weapon set, it charges them only while I'm using that weapon set. However in practice I would like to charge them with both weapon sets, but use the skill I trigger by activating the barrier invocation with the weapon set that is specialized for that (e.g. "+%spell damage while holding a quarterstaff).
The solution for this is to have them always active (no matter which weapon I use), but to cast the triggered spell with the chosen weapon set.

2) The ranger skill snipers mark (also used with as a monk with hands of chayula), doesn't work together with using a support weapon set that is specialized in generating energy charges. By that I mean passive points that increase the maximum energy charge limit, etc. I think the reason for that is that other skills directly generate the energy charge (and keep it when switching to the other weapon set) while snipers mark is triggered by another skill and that skill's weapon set is used for generating the energy charge.
The solution for this is to let the energy charge generation be based on the weapon set that applied snipers mark and not the weapon set that triggers it.