What if you treated YAMS like the tactical objective deck Adepticon developed for Warhammer 40k?
Or possibly a new mission system entirely using the system of drawing objective cards every turn and act upon them. Still very tactical but also reflects the chaotic nature urban combat can create.
Food for thought. And I know, 40k is gross...