drnuncheon
Explorer
Simplest solution: ditch the element/energy correspondences entirely (except for fire) and have elemental damage, as in Arcana Unearthed. You'll have to do some work figuring out which creatures should have Elemental Resistance instead of (or as well as) Energy Resistance, but it gets rid of the wacky issues.