Ideas 

Had my faulty switch joycon replaced (third party)... I know they're more expensive but you're better off buying official first party hardware then it's less likely to break, and easier to get replacements if it does.  I wasn't really keen even to consider them since switch 2 is around the corner.....