Fire HP for Umbreon wouldn't do much significant damage with his low attacking power, but I might replace Charm with Doubleteam to avert the pseudo-hazers. Umbreon is on my particular team because, with a lot of prediction, it helps a lot with Jolteon's part of the Baton Pass chain.