As a one man shop for the small company I work for this is great advice. Inspired me to create a new "read this in case of emergency" doc if I get hit by a bus.
Same here, AMD Ryzen PC. Not liquid cooled, but it is a mini-itx cube which is neat.
I have a mid 2012 MB air that I still love. Screen isn't nearly as nice, but I use it over the MBP because the keyboard isn't like typing on cement and I can actually use it on my lap without feeling like its actively trying to burn my balls off. In all fairness though, I have a XPS 9560 and 9360 and both overheat and throttle like crazy and require throttle stop. Lone cowboy admin for a small company so I've got a pile of laptops.