I like groing the mechs by speed brackets first, and fire capablities as a second thing. Otherwise all your lkances move slower, at the speed of the slowest mech in the lance. Having all-jumpy lances also help if you can.
So I would say:
COMMAND: Battlemaster, Marauder, Awesome, Warhammer/rifleman
FIRE SUPPORT: Archer, Catapult, thunderbolt, Rifleman/warhammer
BATTLE: Wolverine, Griffin, Shadow hawk, Valkyrie
RECON: Phenix Hawk, commando, wasp, locust
The weak link in the whole force is the Awesome. It drags down the command lance and is a poor choice for a fire support unit unles you want for direct fire, with the awesome and Warhammer together.
The battle lance is 5/8 and all jump so is very manouverable. look at alternative configurations for the mechs, like the griffin 1S and wolverine 6M or a more brawler unit.
Hope that helps. Is not that different form what you are telling us, but tries to group the mechs by role. THe mechs in the fire suport and command lances can be swapped quite freely, really, since they are the slow mechs and all have weapon loadouts that can perform well in a multitude of approaches.