Dont worry about the type disadvantages because once you evolve them they will become a lot more stronger and maybe you'll have to work harder for getting some moves but so what .
And for the fifth gym don't worry you'll get many good pokemon on the way that will assist you.
So I say evolve them when they are supposed to.