I'm not sure that I follow some of the lines of reasoning being used in this thread. A Pokemon's type should be defined by its shape and/or color? That just seems kind of narrow and shortsighted somehow. I mean, using that line of reasoning, why isn't Sudowoodo a Grass type, or Doduo/Dodrio a straight Normal type? I mean, yes, they're bird-like, but the poor ***tards don't even have wings.
Pigeon-holing a Pokemon's type based on it's coloration or general body type seems to an incredibly stifling environment in which to try and exercise creativity. Just because something is deadly, frightening, and/or roars doesn't mean it has to be a Dragon or Dark type. The female sprite for Hippowdon is black and grey, has red eyes, and is giving an angry yell; does that mean it should be a Ground/Dark type?
I guess what I'm trying to get at is that it can't hurt to be a little flexible when it comes to a Pokemon's typing, because you open up so many possibilities for new ideas further down the line. Sure, sometimes you'll end up with a couple typings that seem failtastic, and invariably there's gonna be some that just plain don't make sense outside of certain cultures, but overall you get a lot of interesting and thought-provoking stuff to counterbalance the couple of blunders that might happen.
On the other hand, I too would make a change. It is the only change I can actually justify to myself, much less anyone else. I would remove Swablu's Normal type, and that's it. It makes sense to me (and possibly only me) because Swablu seems to be, for all intents and purposes, the result of a bird and a cloud rutting like bunnies, provided they could produce offspring. Again, perhaps I'm the only one who sees this, but I'm okay with Gamefreaks choosing to keep it a Normal/Flying. Perhaps someday we'll see a straight up Flying type, and maybe Swablu will lose its Normal type at that time, but I'll wait until then.
