So I opened up my Switch today and replaced the thermal paste and added a few thermal pads.
Specifically I removed the metal cover from the CPU / RAM chips, cleaned the CPU off with Isopropanol and put a thin sheet of MX4 on it.
There was also a ton of thermal paste slathered all around the CPU...