How to actually fix the Shaman Hero Power.

I've think about some ways to fix the super frustrating Shaman Hero Power.

What is frustrating is when your opponent gets x time in a row the spell power or taunt if you play aggro deck. And even more frustrating is when you play Shaman yourself bit are unable to roll spell power in 6 turns. It basically creates a gap purely generated by RNG between the 2 players, and with the upcoming departure of Azure Drake it might become a bigger problem since it was a safe spell power source.

So my proposal is why not have it being scripted? Here are 2 possibilities to implement it :

(note : all scenario assume all the totem previously summoned have been killed by your opponent)

1/ Everytime I click hero power i can't get the one i previously got. It can be implemented in diff ways

1/a. 1st totem is a 25% and every other totems are 33% excluding the one summoned previously. This way you'll have to at least use your hero power twice to get a second spell power totem.

1/b. 1st totem is 25%, 2nd is 33%, 3rd is 50% and 4th is 100%. And then 2 other possibilities :

1/b.1. The summoning order is being kept for the rest of the battle, this way you'll always have to summon 3 totems before getting you spell power again.

1/b.2. The order is being reseted once your are done summoning the 4 differents totems, meaning you can get spell power in last and then in first but you did 3 before without having it and getting it in 1st on second try is still 25%.

2/ Blizzard manually give an order to totems to be summoned. i.e. 1/1 totem is always the first to be summoned, then the Taunt totem, then the Spell Power and finally the Healing Totem. It'd allow players to play around which totem is being summoned next and adapt their plays, main cons I see to it is the loss of the little moment when you don't know which totem has been summoned and how the turn will go on.

Every proposal got their pros and cons, I personnally like more the 2nd proposal but both 1.b.1 and 1.b.2 would be fine by me. What are your thoughts?