Get both, you could get the pro now and the switch a few months after it releases, just to give Nintendo a chance to reveal more plans for the system and any hidden releases they might still have.
Gaming on:
PC:
Asus Z87-A | i7 4770K | MSI Radeon RX 480 Gaming X 8GB
G. Skill Ripjaws X Series 32 GB DDR3 2133 mhz | WD Blue 1TB SSD & WD Blue HDD 1TB
Consoles:
WiiU
Switch (Docked)
PS 3 / 4
Handhelds:
New 3ds XL
Switch (Portable Mode ;P )