I second the "don't invest in unit range" because of AOE will hit the factory. You want your units to move in to build distance. Maybe base and factories should have a significant splash damage reduction. Cheers!