If you switch out the FF for Endo-Steel, you have enough tonnage free to almost max out armour, and add an additional half ton of MG ammo or another JJ. You should probably also move the heat-sink from the MG arm to one of the side torsos. I use something quite similar to your build, using a STD engine for improved survivability.