Storm Bolt Type Change Without Gathering Storm Tree

I use it primarily for the Shaman mastery passive bonus of elemental resistances with an active totem. I know there are things like upheaval totem and thorn totem but I dislike thorn totem for functionality and flavor purposes, and I often use Upheaval totem for an on-use ability.

Like the Gathering Storm tree isn’t horrible, it would just be nice to have the option to change without taking up a slot with passives or idols or MTX or such. However, it would also be nice if most of the Gathering Storm tree applied to Storm Bolt as well. Then it wouldn’t feel like such a waste. But as of right now, most of the Gathering Storm tree pertains to the melee ability itself and having Storm Stacks, which are typically only gained and expended by using the melee skill actively.

I guess I’m just asking for either a less restrictive way to change the element of Storm Bolt or to simply have Gathering Storm tree have more use for applying to Storm Bolt if I’m going to be railroaded into specializing in it anyway.