Calling out CG Communications

Your # 1 just made me think of something: 

1. Alter the bonus turn modifier. Make it so that only the regular B1s can get bonus turns. Don't include the STAPs, the DDKs and the Command Droid.

So the big problem here is that the dispel is too frequent and it makes it very difficult to kill a single DDK. The rest is frustrating of course, but it doesn't create that end-of-battle horror show that CD+DDK+BonusTurn does. 

This could have been prevented (and, again, I don't expect CG to change the raid now, but with some forethought this could have been prevented) by not dispelling enemies unless B1s are present. You could also make it so that bonus turns apply to everyone, but the bonus turns are ALSO conditional on having an active b1 ally. That would probably be the easiest tweak since you don't have to make individual droids immune to bonus turns. The bonus turns just stop once the B1s are gone. If the dispel stopped as well, then it would be possible to kill a single DDK+CD at the end of a wave using the same team that ripped through the rest of the wave.