You could try to adjust formation with per unit so they fit in the streets; at least that solves some of it (in my case). Also: do not fight on walls; it's even worse there.