Another option would be to have each perk available in the pool for all 3 energy types.. That way you could get the intrinsic function, say HC targeting on any energy type.. But, if the weapon element aligned with the perk's energy type.. eg Void HC targeting, plus void HC, there would be some sort of buff.. And perhaps a slight reduction in bonus if the elements didn't align (say solar armor perk with void weapon.) that would push people toward, but not force the type of element - perk - armor matching that Armor 2.0 has in it.