Current system is fine they just need to make it so you can "prefer" two map choices such that when you queue against some one who has a matching preferred map you both play on it. Then always have two open land maps like arabia, ghost lake, serengeti, land madness, etc. Arabia whores like myself can just "prefer" the open maps, arena clowns will prefer the closed maps, and the plebs can prefer mountain pass all they flippin' want.
On top of that, they need a random civ toggle, where if you match against an opponent which has random civ toggled on then you both play random. If one player doesn't have it toggled then you'll know to pick civ or choose to go random knowing the opponent picked civ.
That solves both major issues while keeping the current system.