I'd like for the avatars to stay the same too, but I am also the originator (in a round about way) of the idea proposed here. I think there is a way of being little more flexible with the avatars and also improving the warpath.
http://www.thewarpath.net/showthread.php?t=5540
You can read everything I had to say on it in that thread.