I can't see Nintendo given up on the 3DS anytime soon considering they're bringing out a new 2DXL next month (obviously for those of us that never used the 3D option...which is everyone)
They clearly have a plan for both going forward, and considering the battery life on the Switch they might still view the 3DS/2DS as their handhelds and the Switch the console.

I'm definitely getting a Switch now though, judging by the talk from 3rd party devs who are making games for it, it looks like the Switch will be the Vita successor i've been waiting for.