Think you better skip the standard collision commands completely. Think it's a good idea to use a grid, but be shure to have the fields overlapping. Use trigonometry math to calculate the distance between two units, if they are too close to each other, push them both away, unless of course one is a lot lighter than the other.
Hope that'll work.
Hope that'll work.