My Nintendo Switch Wi-Fi isn't working

I am getting an abnormally poor wifi connection on my Switch about 20 ft from my router. When docked I get between 0 and 1 bar, and undocked between 1 and 2. I have never seen 3 even when next to the router. The only way i can log on to the eshop is to take it out the dock and go to within 10 to 15 feet from the router. Even then it is not fast. This is in comparison to every other console I have in the same room, including the wii u. I have comcast xfinity, and use their wireless gateway router to provide wifi. I have tried various fixes like resetting it, changing the wireless channels, changing the type of security, and repositioning both the router and console dock. As some one who buys most games digitally I feel I need to sort this out to fully use this system. Any help would be appreciated.