The simple and easy fix to ToF without making it obsolete is making it only affect grenades while in your super. Any changes made to the Melee are irrelevant to the argument about grenades. This opinion is coming from a sunsinger that runs angel of light, radiant will, and fusion grenades. (Self res and flame shield are assumed)