Switching to Diamond and using the trade training advantage was my plan (or trading over my advanced pokemon from that game to fight that gym battle), but I've got to wait until I can borrow my sister's DS to do the trade and since I don't see her that often I kind of gave up and moved on. My Totodile is still one of my most powerful pokemon in my party, but I think I had Pokemon with Ice moves (like Gyarados) rather than Ice type pokemon.
I kinda like the look of the Tepig, and I've never had a Fire Starter before. I've used Water in Silver, Diamond and HeartGold (and Electric in Yellow but I didn't have a choice)