Make Energized attacks fall off out of combat
Part of the reason I think ADCs are a problem right now is that Energized attacks let them burst at the start of a fight/passively waveclear with no interaction. Making Energized stacks fall off out of combat keeps its strength in extended fights (where adcs should be strong) but removes its pre-fight power.
have like a mini Jhin/Cait passive on critting a single shot when it stacks to 100(But make it so it can only stack while in combat). With shiv doing more damage on champions and half damage on Minions. So it does like 100 damage it will only do 50 on Minions Capped.