Enemy spawns on Raid feel really bad

It sucks to be doing great, having fun with pals, and then a bunch of dudes spawn out of thin air and nearly wipe you. Having them come in from smoke grenades is a fine idea, but they all pop that smoke right where you are likely to have just finished fighting. Maybe have them spawn further out and move in to attack?