The problem is still there, since most people play around the same hours (increasing the amount of maps will not change this factor, thus solving nothing). Lowering points (first to 3, so it still got potential for 5 rounds) will increase the maps played, since you'd cycle through them faster, thus actually letting people play more of the maps.
Shuffle feature would be great, yes. We currently have none. We'd still have the potential problem of getting 10 cav maps in a row, but there are... discussions... on how to solve this. Stay tuned.