Nice going!! It's always best you have a full team of 6 against gyms. Also you might want to consider levelling up that trubbish. I know it doesn't seem like much of a threat but it's really helpful (acid spray OP at this point of the game)
@xiri I agree,dragon rage can kill mons