I think I like your original plan, counterattacking seems like it would get too complicated and slow it down too much. 

Edit: But ya the suggested change seems good.