Switch Controller, Wireless Pro... https://www.amazon.com/dp/B089SXYTFC?ref=ppx_pop_mob_ap_share

So if I remember correctly your issue was Joy-Con drift. I just realized that you can buy a single joy con for like 30 bucks (after a quick google search). Pro controllers are nicer though.

Just recently I got this particular controller on Amazon. I realized that this controller seems to only be available in Europe, so I found this controller for the Amazon US-website that seems to just be the one I have, same design and all, but the little text in the middle is missing. I'm just going to assume it is the same controller but under other licensing or something like that.

The controller is really nice, it has rumble, can be used wireless, and it gets recognized as an X-Box controller on your PC, so you can use it without any issue for PC Gaming. It does miss the amiibo scanner but you can probably just use your old Joy-Con for that. For the price of 30€ or $, it doesn't matter, literally same price, this is an great controller.