I would say tau, perhaps i'm biased because i collect them, but to deal with the close quarters combat problems, here are a few things.
Devilfish, Troops get out, shoot for a turn, get back in, drive to the far side of the map, you should have all your troops in these anyway, they're important...