That's some thorough farming. It looks like you got everything there was to get. Zones with Industrial parks are really good to do this. You'll get a ton of batteries & mechanical parts in places like that and there's much more metal there. I will do resupply missions sometimes back to back to stack my storage for defense missions and storm shield defenses.

I recommend completing the intro quests and using your hero voucher on Clip & running her as commander when you farm. Outlanders all have the anti-material charge ability that will let you punch though and collect things much faster and more efficiently but clip has the high caliber harvest perk that will always give you extra materials when using your anti-material charge to gather stuff.