Yeah, going for Switch version also. It seems like the best version; with a much better draw distance, lighting changes and also a more steady frame-rate. Though that's based on comparisons to the older E3 build of the Wii U version.
I do think the Switch is going to be great for convenience and portability. Even though I've kind of lost some interest in handhelds, there's been a lot of times where I enjoyed just playing on the Wii U gamepad when sometimes I felt like playing in bed or at my desk. So I can totally see myself using a mixture of both the dock and handheld mode options.
There's definitely a lot more games I'm interested in though this year. Snipperclips, Splatoon 2 and Mario Odyssey being the big ones. I'm sure they'll be a few more that catch my interest. I may even pick up MK8 if it drops in price a lot.