I would look at the cat, you can get 230hp for a pretty good price compared to a Yamaha. I wouldn't look at a Yamaha until they get they're rod issues figures out. A friend of mine bent a rod last week on his first trip, 48 miles on sled. And he only has a mpi 190hp kit.
Just got finished 4 days riding in west. Snow and temps are the best I've seen in a few years. Defiantly worth the trip. I can't get pics to upload from here. But I'll post some when home.
Defiantly go with a re flash. I think both evo and bikeman products are good. I've been running a 2013 with a bikeman 200-260 tune, 3 inch exhaust, big intercooler, evo brv and cold air intake. Runs about 23-24 psi on the hill at 260 setting. Totally different sled than the '12 I had with a 2.0 BD.