Question 1:
No, the easy access to Vaporeon and its high CP and durability won't be changed with gen 2, and unless something more powerful gets even easier to obtain (which is unlikely), Vaporeons reign will continue.
Question 2:
I'm pretty sure that Ampharos will be better than Jolteon. Although it has slightly lower CP, it's much more durable.
Also, Lanturn is an interesting water/electric type that could be very good against Vaporeon with an electric-type moveset, as it would both have SE STAB and resist Vaporeons attacks at the same time.
Then you have Kingdra, who will double resist Vaporeon. If it gets double dragon STAB, it could be pretty good against it as well.
It's not possible to say yet whether these pokémon will be better counters than the ones currently available, but depending on the movesets they get, they definitely could be.