Just remove elemental affinity all together it’s a terrible system. Also just unlock the damn mod socket to allow every mod. This is all you need to do then you fix armor 2.0
They already said why affinities are here to stay. They gave us universal mods and now the ability to switch. Obviously they are trying to balance community needs with programming limitations.