I really like the two units in the same square idea. It makes sense, because the 5 foot square system is assuming you need some space to fight, and they could weave around one another without trouble. For one thing, I think when they share a square they can't be flanked.