Kha'Zix and Warmogs balance thoughts

so Kha has been under tuned for a while now and this most recent patch made me think of a good way to buff him without changing much, add a on-hit effect to his q. this would make his q stronger in many ways 1) the new OP item would work better on him, and he is a champ that it works with conceptual but now in practice atm. 2) krugs/redbuff procs making krugs come up more and more range for red application. 3) shen and other onhit items would improve on him, i've always liked gantlets on kha to increase his mana pool, cdr, and armor but sometimes AAing isn't optimal and applying on q would be better. Note: this could be part of the evolution as well but I think it would help Kha become a better champion.

in Warmogs current state it is week on a few champs that it really shouldn't be, the reason is self damaging ability's stop the large regen buff, this makes potential champions, mord/mundo much weaker with the item because of this. also for a general complaint of the item is it's a melee item (for the most part) and if you get it in lane trading stops the passive because ranged creeps, i think they need to do the same thing as garen passive and make it so creeps can hit you.