Energy mechs aren't known for their high damage output, therefore you shouldn't just have Energy Fortess. You could probably remove your Nightfall (on your physical mech) and replace the Electric Fortress with your Defense Matrix. If you have another resistance drainer, you should add that on your mech too. Also, replace your Energy Storage Unit with a Energy Engine.
For your heat mech, you could remove the Red Rain and replace your Energy Fortress with a Defense Matrix. Red Rain is a good weapon, but if you use it on this mech, you'll get out of range for both of your Range 3-6 weapons and have to use the Recoiler, which can cause problems if you run out of uses with your Magma Recoiler.