Surgery complete. Magnetic joysticks from GuliKit, buttons from ExtremeRate, plus tools and manuals from iFixit. I wish the buttons were a better color match to the Joycons, but it is uniquely mine, now.